--- libexec/ftpd/ftpcmd.y.ORIGINAL	Sat Aug 17 21:26:22 2002
+++ libexec/ftpd/ftpcmd.y	Sat Aug 17 21:55:52 2002
@@ -690,16 +690,7 @@
 	| SYST check_login CRLF
 		{
 			if ($2)
-#ifdef unix
-#ifdef BSD
-			reply(215, "UNIX Type: L%d Version: BSD-%d",
-				NBBY, BSD);
-#else /* BSD */
-			reply(215, "UNIX Type: L%d", NBBY);
-#endif /* BSD */
-#else /* unix */
 			reply(215, "UNKNOWN Type: L%d", NBBY);
-#endif /* unix */
 		}
 
 		/*
@@ -1550,7 +1541,6 @@
 			printf("\r\n");
 		}
 		(void) fflush(stdout);
-		reply(214, "Direct comments to ftp-bugs@%s.", hostname);
 		return;
 	}
 	upper(s);
--- libexec/ftpd/ftpd.c.ORIGINAL	Sat Aug 17 21:26:10 2002
+++ libexec/ftpd/ftpd.c	Sat Aug 17 21:35:38 2002
@@ -107,7 +107,7 @@
 #include <varargs.h>
 #endif
 
-static char version[] = "Version 6.00LS";
+static char version[] = "";
 #undef main
 
 /* wrapper for KAME-special getnameinfo() */
@@ -629,7 +629,7 @@
 	(void) gethostname(hostname, MAXHOSTNAMELEN - 1);
 	hostname[MAXHOSTNAMELEN - 1] = '\0';
 #endif
-	reply(220, "%s FTP server (%s) ready.", hostname, version);
+	reply(220, "FTP server ready.");
 	for (;;)
 		(void) yyparse();
 	/* NOTREACHED */
@@ -2003,8 +2003,7 @@
 	char hname[INET6_ADDRSTRLEN];
 	int ispassive;
 
-	lreply(211, "%s FTP server status:", hostname, version);
-	printf("     %s\r\n", version);
+	lreply(211, "FTP server status:");
 	printf("     Connected to %s", remotehost);
 	if (!getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len,
 			 hname, sizeof(hname) - 1, NULL, 0,