diff --git a/Changelog b/Changelog
index 7c68cdf..91a00f5 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2.2]
 
+* Add SSL version and cipher to SSL connect message. (caf)
+
 * Add BITCHXRC_NAME to config.h. (caf)
 
 * Correctly handle case when a nick comes between a -s flag and a server name
diff --git a/source/server.c b/source/server.c
index 7ce9510..a5e8ad3 100644
--- a/source/server.c
+++ b/source/server.c
@@ -1352,13 +1352,15 @@ int finalize_server_connect(int refnum, int c_server, int my_from_server)
 		err = SSL_connect (server_list[refnum].ssl_fd);
 		if(err == -1)
 		{
-			server_list[refnum].ssl_error = SSL_get_error((SSL *)server_list[refnum].ssl_fd, err);
+			server_list[refnum].ssl_error = SSL_get_error(server_list[refnum].ssl_fd, err);
 			if(server_list[refnum].ssl_error == SSL_ERROR_WANT_READ || server_list[refnum].ssl_error == SSL_ERROR_WANT_WRITE)
 				return 0;
 		}
 		SSL_show_errors();
 		CHK_SSL(err);
-		say("SSL server connected");
+		say("SSL server connected using %s (%s)",
+			SSL_get_version(server_list[refnum].ssl_fd),
+			SSL_get_cipher(server_list[refnum].ssl_fd));
 	}
 #endif