diff --git a/Changelog b/Changelog
index 0caad5c..1709935 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,8 @@
 [Changes 1.2c01]
 
+* Add /FSET WHOIS_SECURE for SSL connection info on ratbox, unreal and 
+  freenode. (caf)
+
 * Add /FSET CHANNEL_URL for services channel URL numeric. (caf)
 
 * Fix crash bug in $mircansi() scripting function. (caf)
diff --git a/include/color.h b/include/color.h
index 881cee4..8b2dc1e 100644
--- a/include/color.h
+++ b/include/color.h
@@ -308,6 +308,7 @@
 #define DEFAULT_FORMAT_WHOIS_SIGNON_FSET "%K: %Ws%nignon   %K:%n $0-"
 #define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET "%K| %Wa%nctually %K:%n $0-"
 #define DEFAULT_FORMAT_WHOIS_CALLERID_FSET "%K! %Wc%nallerid %K:%n $0-"
+#define DEFAULT_FORMAT_WHOIS_SECURE_FSET "%K! %Ws%necure   %K:%n $0-"
 #define DEFAULT_FORMAT_WHOIS_NAME_FSET "%G³ %Wi%nrcname  %K:%n $0-"
 #define DEFAULT_FORMAT_WHOIS_NICK_FSET "%G³ %W$0 %K(%n$1@$2%K) (%n$3-%K)"
 #define DEFAULT_FORMAT_WHOIS_OPER_FSET "%K| %Wo%nperator %K:%n $0 $1-"
@@ -732,6 +733,7 @@
 #define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K| %Ws%nignon   : $0-":"| signon   : $0-"
 #define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K: %Wa%nctually : $0-":": actually : $0-"
 #define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-"
+#define DEFAULT_FORMAT_WHOIS_SECURE_FSET ansi?"%K! %Ws%necure   : $0-":"! secure   : $0-"
 #define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G: %Wi%nrcname  : $0-":": ircname  : $0-"
 #define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)"
 #define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-"
@@ -755,6 +757,7 @@
 #define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K %Ws%nignon   : $0-":" signon   : $0-"
 #define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K| %Wa%nctually : $0-":"| actually : $0-"
 #define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-"
+#define DEFAULT_FORMAT_WHOIS_SECURE_FSET ansi?"%K! %Ws%necure   : $0-":"! secure   : $0-"
 #define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G³ %Wi%nrcname  : $0-":"³ ircname  : $0-"
 #define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)"
 #define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-"
diff --git a/include/cset.h b/include/cset.h
index c6c54d5..0c007fe 100644
--- a/include/cset.h
+++ b/include/cset.h
@@ -376,6 +376,7 @@ FORMAT_WHOIS_NAME_FSET,
 FORMAT_WHOIS_NICK_FSET,
 FORMAT_WHOIS_OPER_FSET,
 FORMAT_WHOIS_REGISTER_FSET,
+FORMAT_WHOIS_SECURE_FSET,
 FORMAT_WHOIS_SERVER_FSET,
 FORMAT_WHOIS_SERVICE_FSET,
 FORMAT_WHOIS_SHIT_FSET,
diff --git a/source/fset.c b/source/fset.c
index 8bb3af0..af31ce2 100644
--- a/source/fset.c
+++ b/source/fset.c
@@ -253,6 +253,7 @@ IrcVariable fset_array[] =
 	{ "WHOIS_NICK",		0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
 	{ "WHOIS_OPER",		0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
 	{ "WHOIS_REGISTER",	0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
+	{ "WHOIS_SECURE",	0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
 	{ "WHOIS_SERVER",	0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
 	{ "WHOIS_SERVICE",	0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
 	{ "WHOIS_SHIT",		0,STR_TYPE_VAR,	0, NULL, NULL, 0, 0},
@@ -755,6 +756,7 @@ void create_fsets(Window *win, int ansi)
 	fset_string_var(FORMAT_WHOIS_NAME_FSET, DEFAULT_FORMAT_WHOIS_NAME_FSET);
 	fset_string_var(FORMAT_WHOIS_NICK_FSET, DEFAULT_FORMAT_WHOIS_NICK_FSET);
 	fset_string_var(FORMAT_WHOIS_OPER_FSET, DEFAULT_FORMAT_WHOIS_OPER_FSET);
+	fset_string_var(FORMAT_WHOIS_SECURE_FSET, DEFAULT_FORMAT_WHOIS_SECURE_FSET);
 	fset_string_var(FORMAT_WHOIS_SERVER_FSET, DEFAULT_FORMAT_WHOIS_SERVER_FSET);
 	fset_string_var(FORMAT_WHOLEFT_HEADER_FSET, DEFAULT_FORMAT_WHOLEFT_HEADER_FSET);
 	fset_string_var(FORMAT_WHOLEFT_USER_FSET, DEFAULT_FORMAT_WHOLEFT_USER_FSET);
diff --git a/source/numbers.c b/source/numbers.c
index c503281..6f30432 100644
--- a/source/numbers.c
+++ b/source/numbers.c
@@ -1676,6 +1676,12 @@ void numbered_command(char *from, int comm, char **ArgList)
 				display_msg(from, ArgList);
 			break;
 		}
+		case 671:		/* #define RPL_WHOISSECURE      671 */
+		{
+			/* ratbox / unreal / freenode: <nick> :is using a secure connection */
+			put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_SECURE_FSET),"%s %s", ArgList[0], ArgList[1]));
+			break;
+		}
 		default:
 			display_msg(from, ArgList);
 		}