diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 31f19ea18..299cc1f97 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-24  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Install keyserver helpers in @GNUPG_LIBEXECDIR@
+
 2002-07-15  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_ldap.c (send_key, get_key, main): Consult the server
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 343fb4bd2..a01dee6b0 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -21,12 +21,13 @@
 INCLUDES = -I$(top_srcdir)/include
 EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp
 EXTRA_SCRIPTS = gpgkeys_mailto
+libexecdir = @GNUPG_LIBEXECDIR@
 
 # We don't need the libs the regular GPG binaries do
 LIBS=
 
-bin_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@
-bin_SCRIPTS = @GPGKEYS_MAILTO@
+libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@
+libexec_SCRIPTS = @GPGKEYS_MAILTO@
 noinst_SCRIPTS = gpgkeys_test
 
 # don't distribute hkp for now