diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 195bd5bdd..6e112880c 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-11  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Use the more correct @PACKAGE@ rather than "gnupg".
+
 2003-02-06  David Shaw  <dshaw@jabberwocky.com>
 
 	* Makefile.am: Use a local copy of libexecdir so it can be easily
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index ba251438f..2abab02ed 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 = @libexecdir@/gnupg
+libexecdir = @libexecdir@/@PACKAGE@
 
 # We don't need the libs the regular GPG binaries do
 LIBS=