diff --git a/debian/control b/debian/control
index e308a74..77d6749 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: Simon Chopin <chopin.simon@gmail.com>
 Build-Depends:
  debhelper (>= 8),
  python-all (>= 2.6.6-3~),
- libc-bin,
- locales,
+ locales (>= 0),
  python-nose,
  python-setuptools
 Standards-Version: 3.9.4
diff --git a/debian/patches/normalize_test_unicode_name b/debian/patches/normalize_test_unicode_name
index 87c000e..3eacde0 100644
--- a/debian/patches/normalize_test_unicode_name
+++ b/debian/patches/normalize_test_unicode_name
@@ -1,8 +1,8 @@
 Description: Normalize the locale names when testing i18n features
 Author: Simon Chopin <chopin.simon@gmail.com>
-Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
-Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Forwarded: https://lists.fedorahosted.org/pipermail/kitchen-devel/2013-April/000020.html
 Last-Update: 2013-04-23
+
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/tests/test_i18n.py
diff --git a/debian/rules b/debian/rules
index a1f6304..0b0d3e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,7 @@ ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	localedef -f UTF-8 -i en_US ./debian/tmp/locales/en_US.UTF-8/
 	localedef -f UTF-8 -i pt_BR ./debian/tmp/locales/pt_BR.UTF-8/
 	localedef -f ISO-8859-1 -i pt_BR ./debian/tmp/locales/pt_BR.ISO-8859-1/
-	set -e
-	echo $(shell pwd)
+	set -e; \
 	for py in $(shell pyversions -r); do \
 		LOCPATH=$(CURDIR)/debian/tmp/locales/ $$py /usr/bin/nosetests tests; \
 	done