diff --git a/Changelog b/Changelog
index 3324ab0..a9bc3d6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,7 @@
-[Changes 1.2c01 ]
+[Changes 1.2c01]
+
+* Reinstate RPL_WHOISACTUALLY numeric - things seem to have stabilised in
+  the ircd world on this. (caf)
 
 * Fixed two cases where the client was incorrectly deciding that a numeric
   originated from a remote server rather than the local server - this caused
diff --git a/include/color.h b/include/color.h
index 721cc6a..5d9febe 100644
--- a/include/color.h
+++ b/include/color.h
@@ -304,7 +304,7 @@
 #define DEFAULT_FORMAT_WHOIS_IDLE_FSET "%K. %Wi%ndle     %K:%n $0 hours $1 mins $2 secs (signon: $stime($3))"
 #define DEFAULT_FORMAT_WHOIS_SHIT_FSET "%g³ %Ws%nhit     %K:%n L:$0 [$1] $2 $3-"
 #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_ACTUALLY_FSET "%K| %Wa%nctually %K:%n $0 is from $1"
 #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-"
@@ -725,7 +725,7 @@
 #define DEFAULT_FORMAT_WHOIS_IDLE_FSET ansi?"%K: %Wi%ndle     : $0 hours $1 mins $2 secs (signon: $stime($3))":": idle     : $0 hours $1 mins $2 secs (signon: $stime($3))"
 #define DEFAULT_FORMAT_WHOIS_SHIT_FSET ansi?"%g| %Ws%nhit     : L:$0 [$1] $2 $3-":"| shit     : L:$0 [$1] $2 $3-"
 #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_ACTUALLY_FSET ansi?"%K: %Wa%nctually : $0 is from $1":": actually : $0 is from $1"
 #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-"
@@ -747,7 +747,7 @@
 #define DEFAULT_FORMAT_WHOIS_IDLE_FSET ansi?"%K: %Wi%ndle     : $0 hours $1 mins $2 secs (signon: $stime($3))":": idle     : $0 hours $1 mins $2 secs (signon: $stime($3))"
 #define DEFAULT_FORMAT_WHOIS_SHIT_FSET ansi?"%g| %Ws%nhit     : L:$0 [$1] $2 $3-":"| shit     : L:$0 [$1] $2 $3-"
 #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_ACTUALLY_FSET ansi?"%K| %Wa%nctually : $0 is from $1":"| actually : $0 is from $1"
 #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/source/numbers.c b/source/numbers.c
index bf5712c..e953799 100644
--- a/source/numbers.c
+++ b/source/numbers.c
@@ -892,16 +892,13 @@ void numbered_command(char *from, int comm, char **ArgList)
 		break;
 	}
 
-// Seems ircd-ratbox-1.1 has different formatting for this, and parsing it was only displaying
-// correctly for non ratbox-1.1 servers.  Taking this out and just showing what the server
-// gives us for a 338 string until people can standardize.
-//	case 338:		/* #define RPL_WHOISACTUALLY    338 */
-//	{
-//		PasteArgs(ArgList, 1);
-//		if (do_hook(current_numeric, "%s %s", from, ArgList[0]))
-//			put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_ACTUALLY_FSET),"%s", ArgList[0]));
-//		break;
-//	}
+	case 338:		/* #define RPL_WHOISACTUALLY    338 */
+	{
+		PasteArgs(ArgList, 1);
+		if (do_hook(current_numeric, "%s %s %s", from, ArgList[0], ArgList[1]))
+			put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_ACTUALLY_FSET),"%s %s", ArgList[0], ArgList[1]));
+		break;
+	}
 	case 340:		/* #define RPL_INVITING_OTHER	340 */
 	{
 		if (ArgList[2])