diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 74f949395..96cac82a1 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Use W32LIBS where appropriate.
+
 2003-05-29  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_hkp.c, gpgkeys_ldap.c: Include extern references for
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index dd6bf7ffb..83243fefa 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -27,5 +27,5 @@ libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@
 libexec_SCRIPTS = @GPGKEYS_MAILTO@
 noinst_SCRIPTS = gpgkeys_test
 
-gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@
-gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@
+gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@
+gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@