diff --git a/ssh.c b/ssh.c
index c4ca475..5d8be28 100644
--- a/ssh.c
+++ b/ssh.c
@@ -865,8 +865,13 @@ main(int ac, char **av)
 			}
 			break;
 		case 'V':
+			#ifndef WIN32_FIXME
 			fprintf(stderr, "%s, %s\n",
 			    SSH_RELEASE,
+			#else
+			fprintf(stderr, "%s %s, %s\n",
+			    SSH_RELEASE, __DATE__ " " __TIME__ ,
+			#endif
 #ifdef WITH_OPENSSL
 			    SSLeay_version(SSLEAY_VERSION)
 #else
diff --git a/version.h b/version.h
index f6d3d7b..5a4e29e 100644
--- a/version.h
+++ b/version.h
@@ -2,5 +2,9 @@
 
 #define SSH_VERSION	"OpenSSH_7.1"
 
-#define SSH_PORTABLE	"p1 Microsoft Pragma Win32 port Oct 7 2015"
+#ifndef WIN32_FIXME
+#define SSH_PORTABLE	"p1"
+#else
+#define SSH_PORTABLE	"p1 Microsoft Win32 port"
+#endif
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE