diff --git a/Makefile b/Makefile
index 827beb0..a26867c 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ clean:
 	@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz ]; then rm $(BASE)-$(VERSION).tar.gz ; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz.asc ]; then rm $(BASE)-$(VERSION).tar.gz.asc ; fi
+	cd t; $(MAKE) clean
 
 
 #
diff --git a/debian/changelog b/debian/changelog
index a25e08a..e351628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xen-tools (4.3+dev-1) UNRELEASED; urgency=low
+
+  * Remove t/modules.t in upstream's t/Makefile instead of debian/rules'
+    clean target.
+
+ -- Axel Beckert <abe@debian.org>  Wed, 27 Jun 2012 01:25:15 +0200
+
 xen-tools (4.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 1b495d6..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-t/modules.t
diff --git a/t/Makefile b/t/Makefile
index fb9bbbb..f0def07 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -10,4 +10,4 @@ modules: modules.sh
 	./modules.sh > modules.t
 
 clean:
-	-rm *~
+	-rm *~ modules.t