diff --git a/agent/Makefile.am b/agent/Makefile.am
index c814dd995..2204eba9d 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -18,6 +18,9 @@
 
 ## Process this file with automake to produce Makefile.in
 
+localedir = $(datadir)/locale
+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
+
 bin_PROGRAMS = gpg-agent
 pkglib_PROGRAMS = protect-tool
 
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 46de48efa..54d04d23f 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -175,7 +175,7 @@ i18n_init (void)
 #else
 #ifdef ENABLE_NLS
     /* gtk_set_locale (); HMMM: We have not yet called gtk_init */
-    bindtextdomain( PACKAGE, GNUPG_LOCALEDIR );
+    bindtextdomain( PACKAGE, LOCALEDIR );
     textdomain( PACKAGE );
 #endif
 #endif
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index f3c49ea93..25129d662 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -137,7 +137,7 @@ i18n_init (void)
 #else
 #ifdef ENABLE_NLS
     /* gtk_set_locale (); HMMM: We have not yet called gtk_init */
-    bindtextdomain( PACKAGE, GNUPG_LOCALEDIR );
+    bindtextdomain( PACKAGE, LOCALEDIR );
     textdomain( PACKAGE );
 #endif
 #endif
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 5226077bc..fe822a78c 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -19,6 +19,9 @@
 
 ## Process this file with automake to produce Makefile.in
 
+localedir = $(datadir)/locale
+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
+
 EXTRA_DIST = mkerrors
 AM_CPPFLAGS =   $(LIBKSBA_CFLAGS) $(LIBGCRYPT_CLFAGS)
 BUILT_SOURCES = keybox-errors.c
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index dcc073097..b733b81c8 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -126,7 +126,7 @@ i18n_init(void)
     #else
        setlocale( LC_ALL, "" );
     #endif
-    bindtextdomain( PACKAGE, GNUPG_LOCALEDIR );
+    bindtextdomain( PACKAGE, LOCALEDIR );
     textdomain( PACKAGE );
   #endif
   #endif
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 6639aa1c1..b306a3a73 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -18,6 +18,9 @@
 
 ## Process this file with automake to produce Makefile.in
 
+localedir = $(datadir)/locale
+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
+
 bin_PROGRAMS = scdaemon
 
 AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBOPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 1d8bad21d..29256d811 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -138,7 +138,7 @@ i18n_init (void)
 #else
 #ifdef ENABLE_NLS
     /* gtk_set_locale (); HMMM: We have not yet called gtk_init */
-    bindtextdomain( PACKAGE, GNUPG_LOCALEDIR );
+    bindtextdomain( PACKAGE, LOCALEDIR );
     textdomain( PACKAGE );
 #endif
 #endif
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 208e618ec..230922aaf 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-10  Werner Koch  <wk@gnupg.org>
 
+	* Makefile.am (INCLUDES): Add definition for localedir.
+
 	* keylist.c (list_cert_colon): Print the short fingerprint in the
 	key ID field.
 	* fingerprint.c (gpgsm_get_short_fingerprint): New.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 489e59ebe..3e00270fa 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -18,6 +18,9 @@
 
 ## Process this file with automake to produce Makefile.in
 
+localedir = $(datadir)/locale
+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
+
 bin_PROGRAMS = gpgsm
 
 AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl \
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index d17f1c66d..c1cef005b 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -523,7 +523,7 @@ i18n_init(void)
 #  else
   setlocale (LC_ALL, "" );
 #  endif
-  bindtextdomain (PACKAGE, GNUPG_LOCALEDIR);
+  bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 # endif
 #endif