diff --git a/ChangeLog b/ChangeLog
index f38d9e0bb3..ad41d5a82d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-23  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: if supported, add -Wformat-security and
+	-Wformat-non-literal to the compiler flags.
+
 2008-12-23  Sven Neumann  <sven@gimp.org>
 
 	* app/batch.c
diff --git a/configure.in b/configure.in
index e8ab5381d7..5e51260854 100644
--- a/configure.in
+++ b/configure.in
@@ -345,6 +345,12 @@ CFLAGS="$CFLAGS $extra_warnings"
 GIMP_DETECT_CFLAGS(extra_warnings, '-Wmissing-format-attribute')
 CFLAGS="$CFLAGS $extra_warnings"
 
+GIMP_DETECT_CFLAGS(extra_warnings, '-Wformat-security')
+CFLAGS="$CFLAGS $extra_warnings"
+
+GIMP_DETECT_CFLAGS(extra_warnings, '-Wformat-non-literal')
+CFLAGS="$CFLAGS $extra_warnings"
+
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.