diff -Nru hpanel-0.3.2/debian/changelog hpanel-0.3.2/debian/changelog
--- hpanel-0.3.2/debian/changelog	2011-09-19 20:44:26.000000000 +0000
+++ hpanel-0.3.2/debian/changelog	2012-03-23 10:48:15.000000000 +0000
@@ -1,3 +1,29 @@
+hpanel (0.3.2-4) unstable; urgency=low
+
+  * debian/control
+    - (Build-Depends): Rm dpkg-dev; not needed with debhelper 9.
+    - (Standards-Version): Update to 3.9.3.1.
+  * debian/copyright
+    - Update to format 1.0.
+  * debian/rules
+    - Enable all hardening flags.
+    - Use DEB_*_MAINT_* variables.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Fri, 23 Mar 2012 06:48:15 -0400
+
+hpanel (0.3.2-3) unstable; urgency=low
+
+  * debian/compat
+    - Update to 9
+  * debian/control
+    - (Build-Depends): update to debhelper 9, dpkg-dev 1.16.1.
+  * debian/rules
+    - (override_dh_clean): New. Preserve README.orig.
+    - Use hardened CFLAGS.
+      http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sun, 12 Feb 2012 09:06:14 -0500
+
 hpanel (0.3.2-2) unstable; urgency=low
 
   * debian/compat
diff -Nru hpanel-0.3.2/debian/compat hpanel-0.3.2/debian/compat
--- hpanel-0.3.2/debian/compat	2011-09-19 20:33:31.000000000 +0000
+++ hpanel-0.3.2/debian/compat	2012-03-23 10:47:44.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru hpanel-0.3.2/debian/control hpanel-0.3.2/debian/control
--- hpanel-0.3.2/debian/control	2011-09-19 20:33:31.000000000 +0000
+++ hpanel-0.3.2/debian/control	2012-03-23 10:47:46.000000000 +0000
@@ -2,8 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Jari Aalto <jari.aalto@cante.net>
-Build-Depends: debhelper (>= 8), autotools-dev,  libx11-dev, libxpm-dev, x11proto-core-dev, libxft-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev,  libx11-dev, libxpm-dev, x11proto-core-dev, libxft-dev
+Standards-Version: 3.9.3.1
 Vcs-Browser: http://git.debian.org/?p=collab-maint/hpanel.git
 Vcs-Git: git://git.debian.org/git/collab-maint/hpanel.git
 Homepage: http://freshmeat.net/projects/hpanel
diff -Nru hpanel-0.3.2/debian/copyright hpanel-0.3.2/debian/copyright
--- hpanel-0.3.2/debian/copyright	2011-09-19 20:33:31.000000000 +0000
+++ hpanel-0.3.2/debian/copyright	2012-02-12 12:49:13.000000000 +0000
@@ -16,7 +16,7 @@
 
 Files: debian/*
 Copyright:
- 2006-2011 Jari Aalto <jari.aalto@cante.net>
+ 2006-2012 Jari Aalto <jari.aalto@cante.net>
 License: GPL-2+
 
 License: GPL-2+
diff -Nru hpanel-0.3.2/debian/rules hpanel-0.3.2/debian/rules
--- hpanel-0.3.2/debian/rules	2011-09-19 20:43:16.000000000 +0000
+++ hpanel-0.3.2/debian/rules	2012-03-23 10:51:10.000000000 +0000
@@ -1,34 +1,46 @@
 #!/usr/bin/make -f
 
-PACKAGE   = hpanel
+PACKAGE	  = hpanel
 CHANGELOG = debian/upstream.changelog
 
-CFLAGS	 += -Wl,-z,defs \
-		-I/usr/X11R6/include \
-		-I/usr/include/freetype2 \
-		-DHAVE_XPM -DXFT -DCLOCK
+export DEB_BUILD_MAINT_OPTIONS	= hardening=+all
+export DEB_CFLAGS_MAINT_APPEND	= -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+CFLAGS += \
+ -I/usr/X11R6/include \
+ -I/usr/include/freetype2 \
+ -DHAVE_XPM \
+ -DXFT \
+ -DCLOCK 
 
 get-changelog:
 	awk '/Installation:/ {exit} /Changes/,/Installation:/ {print} ' \
 	README \
 	| sed -e 's/[[:space:]]$$//' \
-	      -e 's/^\t/        /' \
+	      -e 's/^\t/	/' \
 	> $(CHANGELOG)
 
 man:
 	$(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE) makeman
 
-override_dh_installchangelogs: get-changelog
+override_dh_clean:
+	# Preserve original file
+	cp README.orig README.orig.keep
+	dh_clean
+	mv README.orig.keep README.orig
+
+override_dh_installchangelogs:
 	dh_installchangelogs  $(CHANGELOG)
 
 override_dh_auto_configure:
 	# Skip this step
 
 override_dh_auto_build: man
-	$(MAKE) CFLAGS="$(CFLAGS)" hpanel
+	$(MAKE) CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" hpanel
 
 override_dh_auto_install:
-	# Skip this step
+	# Disable. See debian/install
 
 %:
 	dh $@
diff -Nru hpanel-0.3.2/debian/upstream.changelog hpanel-0.3.2/debian/upstream.changelog
--- hpanel-0.3.2/debian/upstream.changelog	2011-09-19 20:43:23.000000000 +0000
+++ hpanel-0.3.2/debian/upstream.changelog	2012-02-12 14:01:25.000000000 +0000
@@ -1,9 +1,9 @@
 Changes added to fspanel:
-        When the panel is minimized to the right side
-        it doesn´t reserve screenspace for it self
-        anymore.This means windows can be fully maximized.
-        This works if the panel is on top or on bottom of the
-        screen.
-        This make more sense too me than the original behaviour
-        of fspanel which always reserved screenspace on the
-        bottom of the screen.
+	When the panel is minimized to the right side
+	it doesn´t reserve screenspace for it self
+	anymore.This means windows can be fully maximized.
+	This works if the panel is on top or on bottom of the
+	screen.
+	This make more sense too me than the original behaviour
+	of fspanel which always reserved screenspace on the
+	bottom of the screen.