diff --git a/configure b/configure
index 7f0b5ae..de40bf0 100755
--- a/configure
+++ b/configure
@@ -75,6 +75,14 @@ fi
 [ -n "$USE_XINERAMA" ] && CFLAGS="$CFLAGS -DHAVE_XINERAMA"
 [ -n "$USE_IMLIB2" ] && CFLAGS="$CFLAGS -DHAVE_IMLIB2"
 
+# Debian hardening options http://wiki.debian.org/Hardening
+which dpkg-buildflags > /dev/null 2>&1
+if [ $? -eq 0 ];
+then
+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 `dpkg-buildflags --get CFLAGS`"
+    LDFLAGS="$LDFLAGS `dpkg-buildflags --get LDFLAGS`"
+fi
+
 cat > Makefile << EOF
 PREFIX=$PREFIX
 XDG_CONFIG_DIR=$XDG_CONFIG_DIR
diff --git a/debian/changelog b/debian/changelog
index 7f24f49..4dfb44a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmfs (2~beta201206-3) unstable; urgency=low
+
+  * No hardening-related Lintiant warnings 
+
+ -- Mickaël Raybaud-Roig <raybaudroigm@gmail.com>  Sun, 24 Jun 2012 16:40:54 +0200
+
 wmfs (2~beta201206-2) unstable; urgency=low
 
   * Fixed some Lintian warnings