diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 49fc1ffee444..1b32a2a1364f 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -688,17 +688,17 @@ cmd
 		}
 	| SYST check_login CRLF
 		{
-			if ($2)
-#ifdef unix
+			if ($2) {
+				if (hostinfo)
 #ifdef BSD
-			reply(215, "UNIX Type: L%d Version: BSD-%d",
-				CHAR_BIT, BSD);
+					reply(215, "UNIX Type: L%d Version: BSD-%d",
+					      CHAR_BIT, BSD);
 #else /* BSD */
-			reply(215, "UNIX Type: L%d", CHAR_BIT);
+					reply(215, "UNIX Type: L%d", CHAR_BIT);
 #endif /* BSD */
-#else /* unix */
-			reply(215, "UNKNOWN Type: L%d", CHAR_BIT);
-#endif /* unix */
+				else
+					reply(215, "UNKNOWN Type: L%d", CHAR_BIT);
+			}
 		}
 
 		/*