diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 5551457ab..4b60293e0 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-22  David Shaw  <dshaw@jabberwocky.com>
+
+	* gnupg.spec.in: No longer any need to override libexecdir.  The
+	makefiles now calculate this correctly internally.
+
 2005-03-30  Werner Koch  <wk@g10code.com>
 
 	* w32installer.nsi: Allow including of WINPT source.  Include
diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in
index 2d15c32fe..c43fd2bec 100644
--- a/scripts/gnupg.spec.in
+++ b/scripts/gnupg.spec.in
@@ -25,6 +25,10 @@ Requires(post,preun): /sbin/install-info
 BuildRoot: %{_tmppath}/rpmbuild_%{name}-%{version}
 
 %changelog
+* Fri Apr 22 2005 David Shaw <dshaw@jabberwocky.com>
+- No longer any need to override libexecdir.  The makefiles now
+  calculate this correctly internally.
+
 * Wed Feb 16 2005 David Shaw <dshaw@jabberwocky.com>
 - Fix problem with storing the gpgkeys helpers in libexec, but calling
   them in libexec/gnupg.
@@ -165,7 +169,7 @@ fi
 make
 
 %install
-%makeinstall libexecdir=$RPM_BUILD_ROOT/%{_libexecdir}/gnupg
+%makeinstall
 %find_lang %{name}
 rm %{buildroot}%{_datadir}/%{name}/FAQ
 rm %{buildroot}%{_datadir}/%{name}/faq.html