diff --git a/Changelog b/Changelog
index 1c574f1..46ab3ce 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,8 @@
 [Changes 1.2c01]
 
-* Fix up /WILN, /WILC and /WILCR. (caf).
+* Ensure that SHOW_AWAY_ONCE doesn't hide away status in /whois output. (caf)
+
+* Fix up /WILN, /WILC and /WILCR. (caf)
 
 * Backport changes from epic5 to make recv_nick, sent_nick and sent_body 
   per-server, and apply new version of do_oops from flashback. This means
diff --git a/source/numbers.c b/source/numbers.c
index 0b60705..4307ea0 100644
--- a/source/numbers.c
+++ b/source/numbers.c
@@ -788,6 +788,9 @@ void numbered_command(char *from, int comm, char **ArgList)
 #endif
 			new_free(&userhost);
 		}
+
+		/* Make sure we don't hide the /away message */
+		new_free(&last_away_msg);
 		break;
 	}
 	case 312:		/* #define RPL_WHOISSERVER      312 */