diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 38d65a827..b1622c3ce 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-09  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am (gpgkeys_hkp_LDADD): Need DNSLIBS for the resolver
+	now that we're using SRVs.
+
 2009-05-27  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_hkp.c (srv_replace): Fix build warning.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index fc073adab..feb102fcf 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -1,5 +1,5 @@
 # Copyright (C) 2001, 2002, 2004, 2005, 2006,
-#               2007 Free Software Foundation, Inc.
+#               2007, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -48,7 +48,7 @@ else
 gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@
 gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
 gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@
-gpgkeys_hkp_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
+gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@
 gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@
 gpgkeys_ldap_CPPFLAGS += @LIBCURL_CPPFLAGS@
 endif