diff --git a/g10/ChangeLog b/g10/ChangeLog
index 65e074f5a..c542f767b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-06  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Pass GNUPG_LIBEXECDIR as part of CFLAGS so it can
+	be easily overridden at make time.
+
 2003-02-05  David Shaw  <dshaw@jabberwocky.com>
 
 	* g10.c (print_hex, print_mds): Print long hash strings a lot
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 13ac50b6d..5bb333f7a 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -22,7 +22,9 @@ INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
-LDFLAGS = @LDFLAGS@ 
+LDFLAGS = @LDFLAGS@
+libexecdir = @libexecdir@/gnupg
+CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 
 #noinst_PROGRAMS = gpgd