diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 1d40dce10..fbbf2887f 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-26  David Shaw  <dshaw@jabberwocky.com>
 
+	* Makefile.am: May as well include gpgkeys_hkp.c in the
+	distribution now.  It works well enough without proxies, and isn't
+	built by default.  It would be good to get some test experience
+	with it.
+
 	* gpgkeys_hkp.c (main): Don't warn about include-subkeys - it
 	isn't unsupported, it's actually non-meaningful in the context of
 	HKP (yet).
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index a01dee6b0..a147e1bf9 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -30,8 +30,5 @@ libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@
 libexec_SCRIPTS = @GPGKEYS_MAILTO@
 noinst_SCRIPTS = gpgkeys_test
 
-# don't distribute hkp for now
-nodist_gpgkeys_hkp_SOURCES = gpgkeys_hkp.c
-
 gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@
 gpgkeys_hkp_LDADD = @NETLIBS@