diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 943612e..0560aa1 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -759,8 +759,7 @@ Hello_User(CLIENT * Client)
 		return false;
 	if (!IRC_WriteStrClient
 	    (Client, RPL_YOURHOST_MSG, Client_ID(Client),
-	     Client_ID(Client_ThisServer()), PACKAGE_VERSION, TARGET_CPU,
-	     TARGET_VENDOR, TARGET_OS))
+	     Client_ID(Client_ThisServer()), PACKAGE_VERSION))
 		return false;
 	if (!IRC_WriteStrClient
 	    (Client, RPL_CREATED_MSG, Client_ID(Client), NGIRCd_StartStr))
diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index 562f778..087596a 100644
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -17,7 +17,7 @@
 
 
 #define RPL_WELCOME_MSG			"001 %s :Welcome to the Internet Relay Network %s"
-#define RPL_YOURHOST_MSG		"002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)"
+#define RPL_YOURHOST_MSG		"002 %s :Your host is %s, running version ngircd-%s"
 #define RPL_CREATED_MSG			"003 %s :This server has been started %s"
 #define RPL_MYINFO_MSG			"004 %s %s ngircd-%s %s %s"
 #define RPL_ISUPPORT1_MSG		"005 %s RFC2812 CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnPst CHANLIMIT=#&+:%d :are supported on this server"