diff --git a/ChangeLog b/ChangeLog
index ddbc4dce6..d710704d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan  1 22:56:40 EET 2009 (edwin)
+------------------------------------
+ * Makefile.am, Makefile.in: add -Wformat-security to 'make
+ distcheck'
+
 Thu Jan  1 21:17:47 CET 2009 (acab)
 -----------------------------------
  * libclamav/disasm.c: table fixup
diff --git a/Makefile.am b/Makefile.am
index f6ef52540..a6cae2cce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ pkgconfig_DATA = libclamav.pc
 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
 DISTCLEANFILES = target.h
 if DISTCHECK_ENABLE_FLAGS 
-DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav CFLAGS="-Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
+DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav CFLAGS="-Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
 else
 DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav
 endif
diff --git a/Makefile.in b/Makefile.in
index fce16ba2e..5539a63ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,7 +298,8 @@ DISTCLEANFILES = target.h
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Werror -Wextra -Wall \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wbad-function-cast -Wcast-align \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wendif-labels -Wfloat-equal \
-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wformat=2 -Wmissing-declarations \
+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wformat=2 -Wformat-security \
+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-declarations \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-prototypes \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=missing-prototypes \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wnested-externs \