diff --git a/build-debian-package.sh b/build-debian-package.sh
deleted file mode 100755
index b5e7ba6..0000000
--- a/build-debian-package.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Run this in source directory to easily make the debian package&pals. Be sure
-# the source is ./configured before running. Latest upstream version ($V here)
-# in debian/changelog must be equal to the version listed in configure.ac.
-
-OUT_DIR=debian-packages
-N=`dpkg-parsechangelog --show-field Source`
-VD=`dpkg-parsechangelog --show-field Version`
-V="${VD%-*}"
-NV="$N-$V"
-DIST="$NV.tar.gz"
-ORIG="$OUT_DIR/${N}_$V.orig.tar.gz"
-
-mkdir -p "$OUT_DIR" && \
-make dist && \
-cp "$DIST" "$ORIG" && \
-tar xzf "$DIST" -C "$OUT_DIR" && \
-cp -a debian "$OUT_DIR/$NV/" && \
-cd "$OUT_DIR/$NV" && \
-debuild && \
-cd .. && \
-rm -r "$NV" && \
-echo "READY?" #z80?
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..5abfd85
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[buildpackage]
+no-create-orig = True
diff --git a/debian/rules b/debian/rules
index 3243b57..a481eda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ include /usr/share/dpkg/default.mk
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@  --with autotools-dev
+	dh $@  --with autoreconf
 
 # debmake generated override targets
 # This is example for Cmake (See http://bugs.debian.org/641051 )
@@ -27,6 +27,9 @@ include /usr/share/dpkg/default.mk
 #	dh_auto_configure -- \
 #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
+$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM).tar.gz:
+	$(MAKE) dist
 
-
-
+.PHONY: mk-orig-source
+mk-orig-source: $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM).tar.gz
+	ln -f "$<" ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..e42a8c2
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^(doc|m4)/|^(config|README)\b|^(depcomp|missing|install-sh|compile|INSTALL|ltmain.sh)$|\.tar\.gz$"