diff --git a/src/common_controls_and_elevation.manifest b/src/common_controls_and_elevation.manifest
index b7bfd26d..108030a4 100644
--- a/src/common_controls_and_elevation.manifest
+++ b/src/common_controls_and_elevation.manifest
@@ -26,4 +26,22 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+    <!-- If you don't have those in your app, Windows 10's GetVersionEx() -->
+    <!-- DELIBERATELY reports the WRONG version... which brings us to     -->
+    <!-- tonight's spelling bee: "How do you spell 'spineless morons'?"   -->
+    <!-- The answer: "M-I-C-R-O-S-O-F-T; 'spineless morons'!"             -->
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+    </application> 
+  </compatibility>
 </assembly>
diff --git a/src/rufus.rc b/src/rufus.rc
index 3f2f06e3..b92b720e 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.0.0.587"
+CAPTION "Rufus 2.0.0.588"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -157,7 +157,7 @@ END
 
 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.0.0.587"
+CAPTION "Rufus 2.0.0.588"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -283,7 +283,7 @@ END
 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.0.0.587"
+CAPTION "Rufus 2.0.0.588"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -415,7 +415,7 @@ END
 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.0.0.587"
+CAPTION "Rufus 2.0.0.588"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -671,8 +671,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,587
- PRODUCTVERSION 2,0,0,587
+ FILEVERSION 2,0,0,588
+ PRODUCTVERSION 2,0,0,588
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -689,13 +689,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.0.0.587"
+            VALUE "FileVersion", "2.0.0.588"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.0.0.587"
+            VALUE "ProductVersion", "2.0.0.588"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdfn.c b/src/stdfn.c
index 2a25c10b..0c1f8248 100644
--- a/src/stdfn.c
+++ b/src/stdfn.c
@@ -246,6 +246,8 @@ void GetWindowsVersion(void)
 		if (vi.dwMajorVersion > 6 || (vi.dwMajorVersion == 6 && vi.dwMinorVersion >= 2)) {
 			// Starting with Windows 8.1 Preview, GetVersionEx() does no longer report the actual OS version
 			// See: http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx
+			// And starting with Windows 10 Preview 2, Windows enforces the use of the application/supportedOS
+			// manifest in order for VerSetConditionMask() to report the ACTUAL OS major and minor...
 
 			major_equal = VerSetConditionMask(0, VER_MAJORVERSION, VER_EQUAL);
 			for (major = vi.dwMajorVersion; major <= 9; major++) {
@@ -289,7 +291,10 @@ void GetWindowsVersion(void)
 				break;
 			case 0x63: w = (ws?"8.1":"2012_R2");
 				break;
-			case 0x64: w = (ws?"10":"2015");
+			case 0x64: w = (ws?"10 (Preview 1)":"Server 10 (Preview 1)");
+				break;
+			// Starting with Windows 10 Preview 2, the major is the same as the public-facing version
+			case 0xA0: w = (ws?"10":"Server 10");
 				break;
 			default:
 				if (nWindowsVersion < 0x50)