diff --git a/ChangeLog b/ChangeLog
index 2a08051f0..1f99181f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-17  Werner Koch  <wk@gnupg.org>
+
+	* configure.ac (CFLAGS): Add --Wformat-noliteral in gcc mode.
+
 2003-12-16  Werner Koch  <wk@gnupg.org>
 
 	* configure.ac: Check for funopen and fopencookie as part of the
diff --git a/configure.ac b/configure.ac
index a0cf391a4..72df23915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -894,6 +894,7 @@ esac
 if test "$GCC" = yes; then
     if test "$USE_MAINTAINER_MODE" = "yes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
+        CFLAGS="$CFLAGS -Wformat-nonliteral"
     else
         CFLAGS="$CFLAGS -Wall"
     fi