diff --git a/g10/ChangeLog b/g10/ChangeLog
index a971266b4..eb143f4cb 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-01  Werner Koch  <wk@g10code.com>
+
+	* gpgv.c (i18n_init): Always use LC_ALL.
+
 2004-09-30  Werner Koch  <wk@g10code.com>
 
 	* app-openpgp.c (verify_chv3) [GNUPG_MAJOR_VERSION!=1]: Typo fix.
diff --git a/g10/gpgv.c b/g10/gpgv.c
index ee340cefd..2a316c3c7 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -115,12 +115,7 @@ i18n_init(void)
     set_gettext_file( PACKAGE );
 #else
 #ifdef ENABLE_NLS
-#ifdef HAVE_LC_MESSAGES
-       setlocale( LC_TIME, "" );
-       setlocale( LC_MESSAGES, "" );
-#else
-       setlocale( LC_ALL, "" );
-#endif
+    setlocale( LC_ALL, "" );
     bindtextdomain( PACKAGE, G10_LOCALEDIR );
     textdomain( PACKAGE );
 #endif
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 75f4cc73f..f8299725a 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-01  Werner Koch  <wk@g10code.com>
+
+	* bftest.c (i18n_init): Always use LC_ALL.
+	* shmtest.c (i18n_init): Ditto.
+	* mpicalc.c (i18n_init): Ditto.
+
 2004-09-13  David Shaw  <dshaw@jabberwocky.com>
 
 	* pgpgroup-to-gpggroup: New perl script to take groups from PGP
diff --git a/tools/bftest.c b/tools/bftest.c
index 67a80e33d..49516afc4 100644
--- a/tools/bftest.c
+++ b/tools/bftest.c
@@ -48,11 +48,7 @@ static void
 i18n_init(void)
 {
 #ifdef ENABLE_NLS
-#ifdef HAVE_LC_MESSAGES
-  setlocale( LC_MESSAGES, "" );
-#else
   setlocale( LC_ALL, "" );
-#endif
   bindtextdomain( PACKAGE, G10_LOCALEDIR );
   textdomain( PACKAGE );
 #endif
diff --git a/tools/mpicalc.c b/tools/mpicalc.c
index e582ff609..392bd3ef1 100644
--- a/tools/mpicalc.c
+++ b/tools/mpicalc.c
@@ -66,11 +66,7 @@ static void
 i18n_init(void)
 {
 #ifdef ENABLE_NLS
-#ifdef HAVE_LC_MESSAGES
-  setlocale( LC_MESSAGES, "" );
-#else
   setlocale( LC_ALL, "" );
-#endif
   bindtextdomain( PACKAGE, G10_LOCALEDIR );
   textdomain( PACKAGE );
 #endif
diff --git a/tools/shmtest.c b/tools/shmtest.c
index d8bf72b61..3ef763854 100644
--- a/tools/shmtest.c
+++ b/tools/shmtest.c
@@ -56,11 +56,7 @@ static void
 i18n_init(void)
 {
 #ifdef ENABLE_NLS
-#ifdef HAVE_LC_MESSAGES
-       setlocale( LC_MESSAGES, "" );
-#else
-       setlocale( LC_ALL, "" );
-#endif
+    setlocale( LC_ALL, "" );
     bindtextdomain( PACKAGE, G10_LOCALEDIR );
     textdomain( PACKAGE );
 #endif