diff --git a/GNUmakefile b/GNUmakefile
index 2749bcc47..fa6d640df 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -213,33 +213,33 @@ show-version:
 .PHONY: deb-dapper deb-sid deb-edgy deb-feisty deb-etch
 .PHONY: increment-deb-version
 .PHONY: deb-dapper-head deb-sid-head deb-edgy-head deb-feisty-head
-.PHONY:  deb-etch-head
+.PHONY: deb-etch-head
 
 setup-dapper:
 	rm -f debian
-	ln -s dapper/debian debian
+	ln -s misc/dapper/debian debian
 	chmod a+x debian/rules
 
 setup-sid:
 	rm -f debian
-	ln -s sid/debian debian
+	ln -s misc/sid/debian debian
 	chmod a+x debian/rules
 
 # edgy uses the feisty control files for now
 setup-edgy:
 	rm -f debian
-	ln -s feisty/debian debian
+	ln -s misc/feisty/debian debian
 	chmod a+x debian/rules
 
 setup-feisty:
 	rm -f debian
-	ln -s feisty/debian debian
+	ln -s misc/feisty/debian debian
 	chmod a+x debian/rules
 
 # etch uses the fesity control files for now
 setup-etch:
 	rm -f debian
-	ln -s feisty/debian debian
+	ln -s misc/feisty/debian debian
 	chmod a+x debian/rules
 
 
diff --git a/dapper/debian/changelog b/misc/dapper/debian/changelog
similarity index 100%
rename from dapper/debian/changelog
rename to misc/dapper/debian/changelog
diff --git a/dapper/debian/compat b/misc/dapper/debian/compat
similarity index 100%
rename from dapper/debian/compat
rename to misc/dapper/debian/compat
diff --git a/dapper/debian/control b/misc/dapper/debian/control
similarity index 100%
rename from dapper/debian/control
rename to misc/dapper/debian/control
diff --git a/dapper/debian/copyright b/misc/dapper/debian/copyright
similarity index 100%
rename from dapper/debian/copyright
rename to misc/dapper/debian/copyright
diff --git a/dapper/debian/rules b/misc/dapper/debian/rules
similarity index 100%
rename from dapper/debian/rules
rename to misc/dapper/debian/rules
diff --git a/feisty/debian/changelog b/misc/feisty/debian/changelog
similarity index 100%
rename from feisty/debian/changelog
rename to misc/feisty/debian/changelog
diff --git a/feisty/debian/compat b/misc/feisty/debian/compat
similarity index 100%
rename from feisty/debian/compat
rename to misc/feisty/debian/compat
diff --git a/feisty/debian/control b/misc/feisty/debian/control
similarity index 100%
rename from feisty/debian/control
rename to misc/feisty/debian/control
diff --git a/feisty/debian/copyright b/misc/feisty/debian/copyright
similarity index 100%
rename from feisty/debian/copyright
rename to misc/feisty/debian/copyright
diff --git a/feisty/debian/pycompat b/misc/feisty/debian/pycompat
similarity index 100%
rename from feisty/debian/pycompat
rename to misc/feisty/debian/pycompat
diff --git a/feisty/debian/rules b/misc/feisty/debian/rules
similarity index 100%
rename from feisty/debian/rules
rename to misc/feisty/debian/rules
diff --git a/sid/debian/changelog b/misc/sid/debian/changelog
similarity index 100%
rename from sid/debian/changelog
rename to misc/sid/debian/changelog
diff --git a/sid/debian/compat b/misc/sid/debian/compat
similarity index 100%
rename from sid/debian/compat
rename to misc/sid/debian/compat
diff --git a/sid/debian/control b/misc/sid/debian/control
similarity index 100%
rename from sid/debian/control
rename to misc/sid/debian/control
diff --git a/sid/debian/copyright b/misc/sid/debian/copyright
similarity index 100%
rename from sid/debian/copyright
rename to misc/sid/debian/copyright
diff --git a/sid/debian/pycompat b/misc/sid/debian/pycompat
similarity index 100%
rename from sid/debian/pycompat
rename to misc/sid/debian/pycompat
diff --git a/sid/debian/rules b/misc/sid/debian/rules
similarity index 100%
rename from sid/debian/rules
rename to misc/sid/debian/rules