diff --git a/NEWS b/NEWS
index f4f68f13..b0560c59 100644
--- a/NEWS
+++ b/NEWS
@@ -62,6 +62,7 @@ v0.8.13 2009-xx-xx  The Irssi team <staff@irssi.org>
 	+ introduce the type Irssi::Irc::Client and signals to communicate with
 	  proxy clients to allow for scripting parts of the irssi-proxy.
 	+ Add sb_search.pl, a script for /SCROLLBACK SEARCH
+	- Include hostmask in 001 event sent by proxy (bug #650).
 	- Be more power-friendly: don't run any always-on <1s timers (bug #641).
 	- Don't get confused by a failed /JOIN -window (bug #644).
 	- Properly initialize embedded Perl (PERL_SYS_INIT3).
diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 72bc5b6c..80fd7c2e 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -236,7 +236,7 @@ void proxy_dump_data(CLIENT_REC *client)
 	proxy_client_reset_nick(client);
 
 	/* welcome info */
-	proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network\n", client->proxy_address, client->nick);
+	proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network %s!%s@proxy\n", client->proxy_address, client->nick, client->nick, settings_get_str("user_name"));
 	proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\n", client->proxy_address, client->nick, PACKAGE_VERSION);
 	proxy_outdata(client, ":%s 003 %s :This server was created ...\n", client->proxy_address, client->nick);
 	if (client->server == NULL || !client->server->emode_known)