diff --git a/common/homedir.c b/common/homedir.c
index 6d0674911..28e5c9a2f 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -507,7 +507,7 @@ gnupg_module_name (int which)
 #ifdef GNUPG_DEFAULT_SCDAEMON
       return GNUPG_DEFAULT_SCDAEMON;
 #else
-      X(bindir, "scdaemon");
+      X(libexecdir, "scdaemon");
 #endif
 
     case GNUPG_MODULE_NAME_DIRMNGR:
diff --git a/scd/Makefile.am b/scd/Makefile.am
index a0c0369e7..1af13d0aa 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -19,9 +19,10 @@
 
 EXTRA_DIST = ChangeLog-2011
 
-bin_PROGRAMS = scdaemon
-if ! HAVE_W32_SYSTEM
-libexec_PROGRAMS = gnupg-pcsc-wrapper
+if HAVE_W32_SYSTEM
+libexec_PROGRAMS = scdaemon
+else
+libexec_PROGRAMS = scdaemon gnupg-pcsc-wrapper
 endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common