diff --git a/ChangeLog b/ChangeLog
index 1be71bc9b..e1ceb19ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-05  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Invoke AM_LANGINFO_CODESET.
+
 2007-07-04  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (AUTOMAKE_OPTIONS): Add no-dist-gzip.
diff --git a/configure.ac b/configure.ac
index 2bbca080a..bb8fd69dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,6 +893,8 @@ else
   AC_SUBST(POSUB)
 fi
 
+# We use HAVE_LANGINFO_CODESET in a couple of places.
+AM_LANGINFO_CODESET
 
 #
 # SELinux support