diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 94ee6b6c5..984ab61e7 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,5 +1,9 @@
 2007-04-16  David Shaw  <dshaw@jabberwocky.com>
 
+	* gpgkeys_hkp.c (main): Show curl or fake-curl version string.
+
+	* Makefile.am: Link with libcompat.a for ascii_str(n)casecmp.
+
 	* gpgkeys_curl.c, gpgkeys_ldap.c, gpgkeys_hkp.c, ksutil.c: Rename
 	all str(n)casecmp to ascii_str(n)casecmp.  We want the
 	locale-independent ones here.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 337991031..b28fe0d73 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -47,8 +47,8 @@ gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h
 gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
 else
 gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@
-gpgkeys_curl_LDADD = @LIBCURL@ @GETOPT@
+gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
 gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@
-gpgkeys_hkp_LDADD = @LIBCURL@ @GETOPT@
+gpgkeys_hkp_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
 gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@
 endif
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index f93676905..1a577a9af 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -731,7 +731,7 @@ main(int argc,char *argv[])
   /* Send the response */
 
   fprintf(output,"VERSION %d\n",KEYSERVER_PROTO_VERSION);
-  fprintf(output,"PROGRAM %s\n\n",VERSION);
+  fprintf(output,"PROGRAM %s %s\n\n",VERSION,curl_version());
 
   if(opt->verbose>1)
     {