diff --git a/agent/gpg-agent.w32-manifest.in b/agent/gpg-agent.w32-manifest.in
index 87f09aa49..7991a9699 100644
--- a/agent/gpg-agent.w32-manifest.in
+++ b/agent/gpg-agent.w32-manifest.in
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (Private Key Daemon)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.gpg-agent"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/dirmngr/dirmngr-client.w32-manifest.in b/dirmngr/dirmngr-client.w32-manifest.in
index 1d46d19ff..670bb60f1 100644
--- a/dirmngr/dirmngr-client.w32-manifest.in
+++ b/dirmngr/dirmngr-client.w32-manifest.in
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (Dirmngr Client)</description>
 <assemblyIdentity
     type="win32"
-    name="GnuPG.dirmngr.client"
+    name="GnuPG.dirmngr-client"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/dirmngr/dirmngr_ldap.w32-manifest.in b/dirmngr/dirmngr_ldap.w32-manifest.in
index 67db0841c..509b5e0d1 100644
--- a/dirmngr/dirmngr_ldap.w32-manifest.in
+++ b/dirmngr/dirmngr_ldap.w32-manifest.in
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (LDAP Helper)</description>
 <assemblyIdentity
     type="win32"
-    name="GnuPG.dirmngr.ldap"
+    name="GnuPG.dirmngr-ldap"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/g10/gpg.w32-manifest.in b/g10/gpg.w32-manifest.in
index bf7723925..9a7752382 100644
--- a/g10/gpg.w32-manifest.in
+++ b/g10/gpg.w32-manifest.in
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (OpenPGP tool)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.gpg"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/g10/gpgv.w32-manifest.in b/g10/gpgv.w32-manifest.in
index 794ab15c3..66291a2bc 100644
--- a/g10/gpgv.w32-manifest.in
+++ b/g10/gpgv.w32-manifest.in
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (OpenPGP verify tool)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.gpgv"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/kbx/keyboxd.w32-manifest.in b/kbx/keyboxd.w32-manifest.in
index f2e50fb4b..ff75ea504 100644
--- a/kbx/keyboxd.w32-manifest.in
+++ b/kbx/keyboxd.w32-manifest.in
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (Public Key Daemon)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.keyboxd"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/scd/scdaemon.w32-manifest.in b/scd/scdaemon.w32-manifest.in
index aa0ccb206..224646661 100644
--- a/scd/scdaemon.w32-manifest.in
+++ b/scd/scdaemon.w32-manifest.in
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (Smartcard Daemon)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.scdaemon"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>
diff --git a/sm/gpgsm.w32-manifest.in b/sm/gpgsm.w32-manifest.in
index 7764be394..d477cce32 100644
--- a/sm/gpgsm.w32-manifest.in
+++ b/sm/gpgsm.w32-manifest.in
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <description>GNU Privacy Guard (X.509/CMS Tool)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.gpgsm"
     version="@BUILD_VERSION@"
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
     <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
     <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
   </application>
 </compatibility>
 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
   <security>
     <requestedPrivileges>
       <requestedExecutionLevel level="asInvoker"/>
     </requestedPrivileges>
   </security>
 </trustInfo>
 </assembly>