diff --git a/agent/Makefile.am b/agent/Makefile.am
index f0ba964ec..ad7e967d2 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -1,3 +1,4 @@
+# Makefile.am - agent
 # Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -35,10 +36,10 @@ AM_CPPFLAGS =
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-gpg_agent_robjs = $(resource_objs) gpg-agent-w32info.o
-gpg-agent-w32info.o : gpg-agent.w32-manifest
+gpg_agent_rc_objs = $(resource_objs) gpg-agent-w32info.o
+gpg-agent-w32info.o : gpg-agent.w32-manifest ../common/w32info-rc.h
 else
-gpg_agent_robjs =
+gpg_agent_rc_objs =
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
@@ -74,9 +75,9 @@ gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \
 gpg_agent_LDADD = $(commonpth_libs) \
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-		$(gpg_agent_robjs)
+		$(gpg_agent_rc_objs)
 gpg_agent_LDFLAGS = $(extra_bin_ldflags)
-gpg_agent_DEPENDENCIES = $(gpg_agent_robjs)
+gpg_agent_DEPENDENCIES = $(gpg_agent_rc_objs)
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
diff --git a/agent/gpg-agent.w32-manifest.in b/agent/gpg-agent.w32-manifest.in
index d865aef1a..1ec3268bd 100644
--- a/agent/gpg-agent.w32-manifest.in
+++ b/agent/gpg-agent.w32-manifest.in
@@ -1,6 +1,6 @@
 <?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>
+<description>GNU Privacy Guard (Private Key Daemon)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.gpg-agent"
@@ -15,4 +15,11 @@
     <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/configure.ac b/configure.ac
index ca7bda981..d491dcfc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2006,12 +2006,14 @@ tests/migrations/Makefile
 tests/gpgsm/Makefile
 tests/gpgme/Makefile
 tests/pkits/Makefile
-agent/gpg-agent.w32-manifest
 g10/gpg.w32-manifest
 g10/gpgv.w32-manifest
 sm/gpgsm.w32-manifest
+agent/gpg-agent.w32-manifest
 scd/scdaemon.w32-manifest
 dirmngr/dirmngr.w32-manifest
+dirmngr/dirmngr_ldap.w32-manifest
+dirmngr/dirmngr-client.w32-manifest
 tools/gpgconf.w32-manifest
 tools/gpgtar.w32-manifest
 tools/gpg-connect-agent.w32-manifest
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 8da0d9123..b39447f00 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -22,7 +22,9 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem \
-             dirmngr-w32info.rc dirmngr.w32-manifest.in
+             dirmngr-w32info.rc dirmngr.w32-manifest.in \
+             dirmngr_ldap-w32info.rc dirmngr_ldap.w32-manifest.in \
+             dirmngr-client-w32info.rc dirmngr-client.w32-manifest.in
 
 
 dist_pkgdata_DATA = sks-keyservers.netCA.pem
@@ -46,6 +48,16 @@ AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
+if HAVE_W32_SYSTEM
+dirmngr_rc_objs        = dirmngr-w32info.o
+dirmngr_ldap_rc_objs   = dirmngr_ldap-w32info.o
+dirmngr_client_rc_objs = dirmngr-client-w32info.o
+
+dirmngr-w32info.o        : dirmngr.w32-manifest        ../common/w32info-rc.h
+dirmngr_ldap-w32info.o   : dirmngr_ldap.w32-manifest   ../common/w32info-rc.h
+dirmngr-client-w32info.o : dirmngr-client.w32-manifest ../common/w32info-rc.h
+endif
+
 AM_CFLAGS = $(USE_C99_CFLAGS) \
             $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)	\
             $(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS)		\
@@ -86,23 +98,17 @@ else
 ldaplibs =
 endif
 
-if HAVE_W32_SYSTEM
-dirmngr_robjs = $(resource_objs) dirmngr-w32info.o
-dirmngr-w32info.o : dirmngr.w32-manifest
-else
-dirmngr_robjs =
-endif
-
 
 dirmngr_LDADD = $(libcommonpth) \
         $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
-        $(NETLIBS) $(dirmngr_robj)
+        $(NETLIBS) $(dirmngr_rc_obj)
 if USE_LDAP
 dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
 endif
 dirmngr_LDFLAGS = $(extra_bin_ldflags)
+dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)
 
 if USE_LDAP
 dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
@@ -110,15 +116,18 @@ dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 dirmngr_ldap_LDFLAGS =
 dirmngr_ldap_LDADD = $(libcommon) \
 		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
-		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)  \
+                     $(dirmngr_ldap_rc_objs)
+dirmngr_ldap_DEPENDENCIES = $(dirmngr_ldap_rc_objs)
 endif
 
 dirmngr_client_SOURCES = dirmngr-client.c
 dirmngr_client_LDADD = $(libcommon) \
                        $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-                       $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
-dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
-
+                       $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) \
+                       $(dirmngr_client_rc_objs)
+dirmngr_client_LDFLAGS =
+dirmngr_client_DEPENDENCIES = $(dirmngr_client_rc_objs)
 
 t_common_src = t-support.h t-support.c
 if USE_LIBDNS
diff --git a/dirmngr/dirmngr-client-w32info.rc b/dirmngr/dirmngr-client-w32info.rc
new file mode 100644
index 000000000..020447bca
--- /dev/null
+++ b/dirmngr/dirmngr-client-w32info.rc
@@ -0,0 +1,52 @@
+/* dirmngr-client-w32info.rc                                  -*- c -*-
+ * Copyright (C) 2023 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s dirmngr client\0"
+            VALUE "InternalName", "dirmngr-client\0"
+            VALUE "OriginalFilename", "dirmngr-client.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "dirmngr-client.w32-manifest"
diff --git a/dirmngr/dirmngr-client.w32-manifest.in b/dirmngr/dirmngr-client.w32-manifest.in
new file mode 100644
index 000000000..1d46d19ff
--- /dev/null
+++ b/dirmngr/dirmngr-client.w32-manifest.in
@@ -0,0 +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"
+    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-w32info.rc b/dirmngr/dirmngr-w32info.rc
index c8101b3ea..dd8d258f6 100644
--- a/dirmngr/dirmngr-w32info.rc
+++ b/dirmngr/dirmngr-w32info.rc
@@ -32,7 +32,7 @@
     BEGIN
         BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
         BEGIN
-            VALUE "FileDescription", L"GnuPG\x2019s network daemon\0"
+            VALUE "FileDescription", L"GnuPG\x2019s network access daemon\0"
             VALUE "InternalName", "dirmngr\0"
             VALUE "OriginalFilename", "dirmngr.exe\0"
             VALUE "ProductName",    W32INFO_PRODUCTNAME
diff --git a/dirmngr/dirmngr.w32-manifest.in b/dirmngr/dirmngr.w32-manifest.in
index 719ca9711..31d096528 100644
--- a/dirmngr/dirmngr.w32-manifest.in
+++ b/dirmngr/dirmngr.w32-manifest.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<description>GNU Privacy Guard (Network daemon)</description>
+<description>GNU Privacy Guard (Network Access Daemon)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.dirmngr"
@@ -15,4 +15,11 @@
     <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-w32info.rc b/dirmngr/dirmngr_ldap-w32info.rc
new file mode 100644
index 000000000..779d85837
--- /dev/null
+++ b/dirmngr/dirmngr_ldap-w32info.rc
@@ -0,0 +1,52 @@
+/* dirmngr_ldap-w32info.rc                                  -*- c -*-
+ * Copyright (C) 2023 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s LDAP helper\0"
+            VALUE "InternalName", "dirmngr_ldap\0"
+            VALUE "OriginalFilename", "dirmngr_ldap.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "dirmngr_ldap.w32-manifest"
diff --git a/dirmngr/dirmngr_ldap.w32-manifest.in b/dirmngr/dirmngr_ldap.w32-manifest.in
new file mode 100644
index 000000000..67db0841c
--- /dev/null
+++ b/dirmngr/dirmngr_ldap.w32-manifest.in
@@ -0,0 +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"
+    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/Makefile.am b/g10/Makefile.am
index cd5307e10..e275aaa7f 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -1,3 +1,4 @@
+# Makefile.am - g10
 # Copyright (C) 1998, 1999, 2000, 2001, 2002,
 #               2003, 2006, 2010  Free Software Foundation, Inc.
 #
@@ -19,10 +20,9 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = distsigkey.gpg \
-	     ChangeLog-2011 \
-             gpg-w32info.rc gpg.w32-manifest.in \
-             gpgv-w32info.rc gpgv.w32-manifest.in \
-	     test.c t-keydb-keyring.kbx \
+             gpg-w32info.rc  gpg.w32-manifest.in \
+	     gpgv-w32info.rc gpgv.w32-manifest.in \
+	     ChangeLog-2011 test.c t-keydb-keyring.kbx \
 	     t-keydb-get-keyblock.gpg t-stutter-data.asc \
 	     all-tests.scm
 
@@ -90,13 +90,11 @@ endif
 
 
 if HAVE_W32_SYSTEM
-gpg_robjs = $(resource_objs) gpg-w32info.o
-gpgv_robjs = $(resource_objs) gpgv-w32info.o
-gpg-w32info.o : gpg.w32-manifest
-gpgv-w32info.o : gpgv.w32-manifest
-else
-gpg_robjs =
-gpgv_robjs =
+gpg_rc_objs = gpg-w32info.o
+gpgv_rc_objs = gpgv-w32info.o
+
+gpg-w32info.o  : gpg.w32-manifest   ../common/w32info-rc.h
+gpgv-w32info.o : gpgv.w32-manifest  ../common/w32info-rc.h
 endif
 
 common_source =  \
@@ -183,11 +181,11 @@ LDADD =  $(needed_libs) ../common/libgpgrl.a \
          $(ZLIBS) $(LIBINTL) $(CAPLIBS)
 gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
-	     $(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
+	     $(LIBICONV) $(gpg_rc_objs) $(extra_sys_libs)
 gpg_LDFLAGS = $(extra_bin_ldflags)
 gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
               $(GPG_ERROR_LIBS) $(NETLIBS) \
-	      $(LIBICONV) $(gpgv_robjs) $(extra_sys_libs)
+	      $(LIBICONV) $(gpgv_rc_objs) $(extra_sys_libs)
 gpgv_LDFLAGS = $(extra_bin_ldflags)
 
 gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
diff --git a/g10/gpg.w32-manifest.in b/g10/gpg.w32-manifest.in
index 24484dbfc..418fa784e 100644
--- a/g10/gpg.w32-manifest.in
+++ b/g10/gpg.w32-manifest.in
@@ -15,4 +15,11 @@
     <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/gpgv-w32info.rc b/g10/gpgv-w32info.rc
index 9182fa4a7..a6c1b6cd3 100644
--- a/g10/gpgv-w32info.rc
+++ b/g10/gpgv-w32info.rc
@@ -1,5 +1,5 @@
-/* gpgv-w32info.rc                                           -*- c -*-
- * Copyright (C) 2020 g10 Code GmbH
+/* gpgv-w32info.rc                                            -*- c -*-
+ * Copyright (C) 2013 g10 Code GmbH
  *
  * This file is free software; as a special exception the author gives
  * unlimited permission to copy and/or distribute it, with or without
diff --git a/g10/gpgv.w32-manifest.in b/g10/gpgv.w32-manifest.in
index b7a212058..5dd8408e7 100644
--- a/g10/gpgv.w32-manifest.in
+++ b/g10/gpgv.w32-manifest.in
@@ -15,4 +15,11 @@
     <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/scd/Makefile.am b/scd/Makefile.am
index 32be6aba9..d02bbca5f 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -1,3 +1,4 @@
+# Makefile.am - scd
 # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -26,7 +27,8 @@ AM_CPPFLAGS = $(LIBUSB_CPPFLAGS)
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-scdaemon_robjs = $(resource_objs) scdaemon-w32info.o
+scdaemon_rc_objs = $(resource_objs) scdaemon-w32info.o
+scdaemon-w32info.o : scdaemon.w32-manifest ../common/w32info-rc.h
 endif
 
 AM_CFLAGS =  $(LIBGCRYPT_CFLAGS) \
@@ -48,4 +50,5 @@ scdaemon_SOURCES = \
 scdaemon_LDADD = $(libcommonpth) \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
-        $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(scdaemon_robjs)
+        $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(scdaemon_rc_objs)
+scdaemon_DEPENDENCIES = $(resource_objs)
diff --git a/scd/scdaemon.w32-manifest.in b/scd/scdaemon.w32-manifest.in
index 22dabb697..7a0c12e2c 100644
--- a/scd/scdaemon.w32-manifest.in
+++ b/scd/scdaemon.w32-manifest.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<description>GNU Privacy Guard (Scmartcard daemon)</description>
+<description>GNU Privacy Guard (Smartcard Daemon)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.scdaemon"
@@ -15,4 +15,11 @@
     <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/sm/Makefile.am b/sm/Makefile.am
index 0bc7640c0..ee0e91dbf 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -17,7 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc gpgsm.w32-manifest.in
+EXTRA_DIST = ChangeLog-2011 \
+             gpgsm-w32info.rc gpgsm.w32-manifest.in
 
 bin_PROGRAMS = gpgsm
 
@@ -27,10 +28,8 @@ AM_CPPFLAGS = -DKEYBOX_WITH_X509=1
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-gpgsm_robjs = $(resource_objs) gpgsm-w32info.o
-gpgsm-w32info.o : gpgsm.w32-manifest
-else
-gpgsm_robjs =
+gpgsm_rc_objs = $(resource_objs) gpgsm-w32info.o
+gpgsm-w32info.o : gpgsm.w32-manifest ../common/w32info-rc.h
 endif
 
 gpgsm_SOURCES = \
@@ -65,8 +64,10 @@ common_libs = ../kbx/libkeybox509.a $(libcommon)
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
               $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
-	      $(LIBICONV) $(gpgsm_robjs) $(extra_sys_libs) $(NETLIBS)
+	      $(LIBICONV) $(gpgsm_rc_objs) $(extra_sys_libs) $(NETLIBS)
 gpgsm_LDFLAGS = $(extra_bin_ldflags)
+gpgsm_DEPENDENCIES = $(gpgsm_rc_objs)
+
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.
diff --git a/sm/gpgsm.w32-manifest.in b/sm/gpgsm.w32-manifest.in
index 30557889e..413b3e34a 100644
--- a/sm/gpgsm.w32-manifest.in
+++ b/sm/gpgsm.w32-manifest.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<description>GNU Privacy Guard (X409/CMS tool)</description>
+<description>GNU Privacy Guard (X.509/CMS Tool)</description>
 <assemblyIdentity
     type="win32"
     name="GnuPG.gpgsm"
@@ -15,4 +15,11 @@
     <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/tools/Makefile.am b/tools/Makefile.am
index acc649ccd..262876ff9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -32,23 +32,20 @@ AM_CPPFLAGS =
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-gpgconf_robjs =           $(resource_objs) gpgconf-w32info.o
-gpgtar_robjs =            $(resource_objs) gpgtar-w32info.o
-gpg_connect_agent_robjs = $(resource_objs) gpg-connect-agent-w32info.o
-gpg_check_pattern_robjs = $(resource_objs) gpg-check-pattern-w32info.o
-gpg_wks_client_robjs =    $(resource_objs) gpg-wks-client-w32info.o
+gpgconf_rc_objs =           $(resource_objs) gpgconf-w32info.o
+gpgtar_rc_objs =            $(resource_objs) gpgtar-w32info.o
+gpg_connect_agent_rc_objs = $(resource_objs) gpg-connect-agent-w32info.o
+gpg_check_pattern_rc_objs = $(resource_objs) gpg-check-pattern-w32info.o
+gpg_wks_client_rc_objs =    $(resource_objs) gpg-wks-client-w32info.o
 
-gpgconf-w32info.o:           gpgconf.w32-manifest
-gpgtar-w32info.o:            gpgtar.w32-manifest
-gpg-connect-agent-w32info.o: gpg-connect-agent.w32-manifest
-gpg-check-pattern-w32info.o: gpg-check-pattern.w32-manifest
-gpg-wks-client-w32info.o:    gpg-wks-client.w32-manifest
-else
-gpg_connect_agent_robjs =
-gpgconf_robjs =
-gpg_check_pattern_robjs =
-gpgtar_robjs =
-gpg_wks_client_robjs =
+gpg-connect-agent-w32info.o  : gpg-connect-agent.w32-manifest \
+                                                     ../common/w32info-rc.h
+gpgconf-w32info.o            : gpgconf.w32-manifest  ../common/w32info-rc.h
+gpgtar-w32info.o             : gpgtar.w32-manifest   ../common/w32info-rc.h
+gpg-check-pattern-w32info.o  : gpg-check-pattern.w32-manifest \
+                                                     ../common/w32info-rc.h
+gpg-wks-client-w32info.o     : gpg-wks-client.w32-manifest \
+                                                     ../common/w32info-rc.h
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
@@ -123,7 +120,7 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c
 gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
                 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	        $(LIBICONV) $(W32SOCKLIBS) \
-	        $(gpgconf_robjs)
+	        $(gpgconf_rc_objs)
 gpgconf_LDFLAGS = $(extra_bin_ldflags)
 
 gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
@@ -141,14 +138,14 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
 	                  $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
                           $(GPG_ERROR_LIBS) \
                           $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-                          $(gpg_connect_agent_robjs)
+                          $(gpg_connect_agent_rc_objs)
 
 gpg_check_pattern_SOURCES = gpg-check-pattern.c
 gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_check_pattern_LDADD = $(common_libs) $(regexp_libs) $(LIBGCRYPT_LIBS) \
 			  $(GPG_ERROR_LIBS) \
 			  $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
-			  $(LIBICONV) $(gpg_check_pattern_robjs)
+			  $(LIBICONV) $(gpg_check_pattern_rc_objs)
 
 gpgtar_SOURCES = \
 	gpgtar.c gpgtar.h \
@@ -158,7 +155,7 @@ gpgtar_SOURCES = \
 gpgtar_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
                $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
-	       $(gpgtar_robjs)
+	       $(gpgtar_rc_objs)
 
 gpg_wks_server_SOURCES = \
 	gpg-wks-server.c \
@@ -190,7 +187,7 @@ gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(LIBGCRYPT_CFLAGS) \
 gpg_wks_client_LDADD = $(libcommon) \
 		       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		       $(LIBINTL) $(LIBICONV) $(NETLIBS) \
-		       $(gpg_wks_client_robjs)
+		       $(gpg_wks_client_rc_objs)
 
 
 # Make sure that all libs are build before we use them.  This is
diff --git a/tools/gpg-check-pattern.w32-manifest.in b/tools/gpg-check-pattern.w32-manifest.in
index 2a5f8ec72..acb7c914a 100644
--- a/tools/gpg-check-pattern.w32-manifest.in
+++ b/tools/gpg-check-pattern.w32-manifest.in
@@ -15,4 +15,11 @@
     <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/tools/gpg-connect-agent.w32-manifest.in b/tools/gpg-connect-agent.w32-manifest.in
index aba542052..c222a6794 100644
--- a/tools/gpg-connect-agent.w32-manifest.in
+++ b/tools/gpg-connect-agent.w32-manifest.in
@@ -15,4 +15,11 @@
     <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/tools/gpg-wks-client.w32-manifest.in b/tools/gpg-wks-client.w32-manifest.in
index ba2508e5f..c44620f0e 100644
--- a/tools/gpg-wks-client.w32-manifest.in
+++ b/tools/gpg-wks-client.w32-manifest.in
@@ -15,4 +15,11 @@
     <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/tools/gpgconf.w32-manifest.in b/tools/gpgconf.w32-manifest.in
index d7a1b01ec..ab5f17d04 100644
--- a/tools/gpgconf.w32-manifest.in
+++ b/tools/gpgconf.w32-manifest.in
@@ -15,4 +15,11 @@
     <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/tools/gpgtar.w32-manifest.in b/tools/gpgtar.w32-manifest.in
index 62d5937fa..b949a6baa 100644
--- a/tools/gpgtar.w32-manifest.in
+++ b/tools/gpgtar.w32-manifest.in
@@ -15,4 +15,11 @@
     <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>