diff --git a/src/os_mswin.c b/src/os_mswin.c
index 6c92428a0a..be71fac73f 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -127,9 +127,9 @@ win_version_init(void)
 
     osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
     pRtlGetVersion(&osver);
-    win_version =
-	MAKE_VER(osver.dwMajorVersion, osver.dwMinorVersion,
-		 osver.dwBuildNumber);
+    win_version = MAKE_VER(min(osver.dwMajorVersion, 0xFF),
+	    min(osver.dwMinorVersion, 0xFF),
+	    min(osver.dwBuildNumber, 0xFFFF));
 }
 
 /*
diff --git a/src/os_win32.h b/src/os_win32.h
index 6eaa951e7a..6f395eede7 100644
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -227,4 +227,4 @@ Trace(char *pszFormat, ...);
 
 // Windows Version
 #define MAKE_VER(major, minor, build) \
-    ((((major) & 0xFF) << 24) | (((minor) & 0xFF) << 16) | ((build) & 0x7FFF))
+    (((major) << 24) | ((minor) << 16) | (build))
diff --git a/src/version.c b/src/version.c
index f6eee54534..83c07847e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    212,
 /**/
     211,
 /**/