diff --git a/ChangeLog b/ChangeLog
index 9f901e802..592e92593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 	* THANKS: Added Phong Nguyen, who found the Elgamal signing key
 	problem.
 
+2003-12-23  Werner Koch  <wk@gnupg.org>
+
+	* configure.ac: Use -Wformat-nonliteral in maintainer-mode.
+
 2003-11-30  David Shaw  <dshaw@jabberwocky.com>
 
 	* NEWS: Note --disable-rsa.
diff --git a/configure.ac b/configure.ac
index fb096a695..e8d9eaf87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1118,6 +1118,7 @@ AC_SUBST(W32LIBS)
 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