diff --git a/debian/changelog b/debian/changelog
index 4aaf5a49..b8adaf8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ midori (0.5.2+dfsg-1) UNRELEASED; urgency=low
     to the NMU by Koichi Akabe
     - refreshed patches
     - add new Build-Dep on libzeitgeist-dev
+  * Improve dh_auto_clean target in d/rules to handle some leftover
+    files from quilt and waf
 
- -- Ryan Niebur <ryan@debian.org>  Wed, 23 Oct 2013 20:46:22 -0700
+ -- Ryan Niebur <ryan@debian.org>  Wed, 23 Oct 2013 21:04:40 -0700
 
 midori (0.4.3+dfsg-0.1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 259b7558..77f4eb63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,10 @@ override_dh_install: debian/presubj
 	$(CMD) --fail-missing
 
 override_dh_auto_clean:
+	! which quilt >/dev/null || ! test -d .pc || quilt pop -a
+	rm -fr .pc
 	$(WAF) --nocache distclean
-	rm -rf _build_
+	rm -rf _build_ _build
 	rm -rf .waf*
 	rm -rf .lock-wscript
 	rm -rf `find waf-modules -name "*.pyc"`