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 0b43f5d..4dfb44a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,17 @@
-wmfs (2~beta201206) unstable; urgency=low
+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
+  * New standards version
+
+ -- Mickaël Raybaud-Roig <raybaudroigm@gmail.com>  Sun, 24 Jun 2012 15:19:38 +0200
+
+wmfs (2~beta201206-1) unstable; urgency=low
 
   * Updated changelog version
   * Added build-depends to the control file
diff --git a/debian/control b/debian/control
index d0da025..cb22fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: extra
 Maintainer: Mickaël Raybaud-Roig <raybaudroigm@gmail.com>
 Build-Depends: debhelper (>= 8.0.0), libimlib2-dev, libxinerama-dev, libx11-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://wmfs.info
 Vcs-Git: git://github.com/xorg62/wmfs.git
 Vcs-Browser: https://github.com/xorg62/wmfs
diff --git a/debian/copyright b/debian/copyright
index f294eac..3bbfdc1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,16 @@ Source: http://wmfs.info
 
 Files: *
 Copyright: 2011-2012 Martin Duquesnoy <xorg62@gmail.com>
-License: BSD-3-Clause
+License: BSD-3-Clauses
 
 Files: debian/*
 Copyright: 2012 Mickaël Raybaud-Roig <raybaudroigm@gmail.com>
-License: WTFPL-v2
+License: WTFPL-2
 
-License: BSD-3-Clause
+License: BSD-3-Clauses
+ Copyright (c) 1983 The Regents of the University of California.
+ All rights reserved.
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -35,7 +38,7 @@ License: BSD-3-Clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Licence: WTFPL-v2
+License: WTFPL-2
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004
  .
diff --git a/debian/docs b/debian/docs
index 1f562b3..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
 README
-COPYING