diff --git a/GNUmakefile b/GNUmakefile
index b1e252678..0e937a64d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -129,10 +129,10 @@ show:
 	echo $(DEBVER)
 	echo $(DEBSTRING)
 
-.PHONY: setup-dapper setup-sid setup-feisty
-.PHONY: deb-dapper deb-sid deb-feisty
+.PHONY: setup-dapper setup-sid setup-edgy setup-feisty
+.PHONY: deb-dapper deb-sid deb-edgy deb-feisty
 .PHONY: increment-deb-version
-.PHONY: deb-dapper-head deb-sid-head deb-feisty-head
+.PHONY: deb-dapper-head deb-sid-head deb-edgy-head deb-feisty-head
 
 setup-dapper:
 	rm -f debian
@@ -144,6 +144,12 @@ setup-sid:
 	ln -s 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
+	chmod a+x debian/rules
+
 setup-feisty:
 	rm -f debian
 	ln -s feisty/debian debian
@@ -154,6 +160,8 @@ deb-dapper: setup-dapper
 	fakeroot debian/rules binary
 deb-sid: setup-sid
 	fakeroot debian/rules binary
+deb-edgy: setup-edgy
+	fakeroot debian/rules binary
 deb-feisty: setup-feisty
 	fakeroot debian/rules binary
 
@@ -163,6 +171,8 @@ deb-dapper-head: setup-dapper increment-deb-version
 	fakeroot debian/rules binary
 deb-sid-head: setup-sid increment-deb-version
 	fakeroot debian/rules binary
+deb-edgy-head: setup-edgy increment-deb-version
+	fakeroot debian/rules binary
 deb-feisty-head: setup-feisty increment-deb-version
 	fakeroot debian/rules binary