diff --git a/agent/ChangeLog b/agent/ChangeLog
index 264ad53c7..46e0b6fe3 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Makefile.am (libexec_PROGRAMS) [W32CE]: Do not build
 	gpg-preset-passphrase for now.
+	(pwquery_libs) [W32CE]: Set to empty.
 
 	* trustlist.c (read_one_trustfile): Use estream.
 
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 8ec81932f..9258fc86d 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -51,7 +51,11 @@ gpg_agent_SOURCES = \
 
 common_libs = $(libcommon) ../gl/libgnu.a
 commonpth_libs = $(libcommonpth) ../gl/libgnu.a
+if HAVE_W32CE_SYSTEM
+pwquery_libs = 
+else
 pwquery_libs = ../common/libsimple-pwquery.a
+endif
 
 #if HAVE_W32_SYSTEM
 #.rc.o: