diff --git a/debian/README.source b/debian/README.source
index a304648..e9c718c 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -2,7 +2,6 @@ This Debian package is developed in a Git repository (see the Vcs-Git field
 of debian/control).  To build from a git checkout:
 
 	debian/rules get-orig-source VERSION=201007
-	mv xburst-tools_*.tar.gz ..
 	debian/autogen.sh
 	debuild
 
diff --git a/debian/changelog b/debian/changelog
index 9a185c9..ef1392c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xburst-tools (0.0+201007-1) lucid; urgency=low
+xburst-tools (201007-1) lucid; urgency=low
 
   * Initial release, taken from commit 7b710f3 (Closes: #535429)
 
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 15032dc..fdd02d8 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -2,16 +2,20 @@
 # Build a tarball from the latest upstream version, with a nice
 # version number.
 #
-# Requires git 1.6.6 or later, GNU date, and gzip.
+# Requires tar.
 
 set -e
 
 : ${VERSION=201007}
 
-[ -f xburst-tools_${VERSION}.tar.bz2 ] || wget http://projects.qi-hardware.com/media/upload/xburst-tools/files/xburst-tools_${VERSION}.tar.bz2
-mkdir -p get-orig-source
-echo `pwd`
-cd get-orig-source && tar -jxf ../xburst-tools_${VERSION}.tar.bz2
-rm -rf get-orig-source/xburst-tools/debian get-orig-source/xburst-tools/.git
-cd get-orig-source && tar -czf ../../xburst-tools_${VERSION}-1.orig.tar.gz xburst-tools/
-rm -rf xburst-tools_${VERSION}.tar.bz2 get-orig-source
\ No newline at end of file
+mkdir -p debian-orig-source
+trap 'rm -fr debian-orig-source xburst-tools_${VERSION}.tar.bz2 || exit 1' EXIT INT TERM
+
+[ -f xburst-tools_${VERSION}.tar.bz2 ] || \
+	wget http://projects.qi-hardware.com/media/upload/xburst-tools/files/xburst-tools_${VERSION}.tar.bz2
+
+tar -jxf xburst-tools_${VERSION}.tar.bz2 -C debian-orig-source
+rm -rf debian-orig-source/debian
+cd debian-orig-source && tar -czf ../../xburst-tools_${VERSION}.orig.tar.gz . && cd ..
+
+rm -fr debian-orig-source xburst-tools_${VERSION}.tar.bz2
diff --git a/debian/rules b/debian/rules
index 38d591d..7a76721 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,10 +58,4 @@ firmware: configure
 VERSION = 201007
 debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:
-	[ -f xburst-tools_$(VERSION).tar.bz2 ] || wget \
-		http://projects.qi-hardware.com/media/upload/xburst-tools/files/xburst-tools_$(VERSION).tar.bz2
-	mkdir -p get-orig-source
-	cd get-orig-source && tar -jxf ../xburst-tools_$(VERSION).tar.bz2
-	rm -rf get-orig-source/xburst-tools/debian get-orig-source/xburst-tools/.git
-	cd get-orig-source && tar -czf ../../xburst-tools_0.0+$(VERSION).orig.tar.gz .
-	rm -rf xburst-tools_$(VERSION).tar.bz2 get-orig-source
+	VERSION='$(VERSION)' sh '$(debiandir_SQ)'get-orig-source.sh