3 files changed, 34 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 958605eb8b8..8c1e928036c 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs-x64.manifest:
+        * emacs-x86.manifest: Declare that we target Windows 8.1 as well
+        as earlier versions.  This is so GetVersion and GetVersionEx APIs
+        used for bug reporting and other purposes return accurate version
+        number on Windows 8.1.  See the discussion on MSDN
+        http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx
+        for more details.
+
 2013-12-12  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/ms-w32.h (MAX_UTF8_PATH): New macro.
diff --git a/nt/emacs-x64.manifest b/nt/emacs-x64.manifest
index 517e44f150b..5434e29377a 100644
--- a/nt/emacs-x64.manifest
+++ b/nt/emacs-x64.manifest
@@ -18,4 +18,16 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+      <application> 
+         <!-- Windows 8.1 -->
+         <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+         <!-- Windows Vista -->
+         <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+         <!-- Windows 7 -->
+         <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+         <!-- Windows 8 -->
+         <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      </application> 
+    </compatibility>
 </assembly>
diff --git a/nt/emacs-x86.manifest b/nt/emacs-x86.manifest
index 64c6f1edfb7..7f09c56f9dd 100644
--- a/nt/emacs-x86.manifest
+++ b/nt/emacs-x86.manifest
@@ -18,4 +18,16 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+      <application> 
+        <!-- Windows 8.1 -->
+        <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+        <!-- Windows Vista -->
+        <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+        <!-- Windows 7 -->
+        <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+        <!-- Windows 8 -->
+        <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      </application> 
+    </compatibility>
 </assembly>