diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index bb445c04f..195bd5bdd 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-06  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Use a local copy of libexecdir so it can be easily
+	overridden at make time.
+
 2003-01-22  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_mailto.in: Fix regexp to work properly if the "keyid" is
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 6ef15d801..ba251438f 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -21,7 +21,7 @@
 INCLUDES = -I$(top_srcdir)/include
 EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp
 EXTRA_SCRIPTS = gpgkeys_mailto
-libexecdir = @GNUPG_LIBEXECDIR@
+libexecdir = @libexecdir@/gnupg
 
 # We don't need the libs the regular GPG binaries do
 LIBS=