diff --git a/debian/changelog b/debian/changelog
index 791b244..7c24301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,43 +3,15 @@ fped (0.1+201209-1) unstable; urgency=low
   * New snapshot, taken from commit dfac631
   * Switched to new project host: http://projects.qi-hardware.com/p/fped
   * debian/rules:
+    - include debian buildflags
     - rewrite as a minimal rules file using dh
     - add a get-orig-source target
-  * debian/autogen.sh: new script
-
- -- Xiangfu Liu <xiangfu@openmobilefree.net>  Thu, 21 Jun 2012 16:58:21 +0800
-
-fped (0.0+r6006-1) unstable; urgency=low
-
-  * New snapshot, taken from commit 78e4ba0
-  * update to r6006
-
- -- Xiangfu Liu <xiangfu@openmobilefree.net>  Fri, 25 Mar 2011 08:43:21 +0800
-
-fped (0.0+r6005-1) unstable; urgency=low
-
-  * New snapshot, taken from commit 335ddb6
-  * update to r6005
-
- -- Xiangfu Liu <xiangfu@openmobilefree.net>  Wed, 23 Mar 2011 16:28:26 +0800
-
-fped (0.0+r5999-1) unstable; urgency=low
-
-  * New snapshot, taken from commit 1409cfa
-  * update to r5999
-
- -- Xiangfu Liu <xiangfu@openmobilefree.net>  Tue, 22 Mar 2011 15:12:02 +0800
-
-fped (0.0+r5997-1) unstable; urgency=low
-
-  * New snapshot, taken from commit ceaa519
   * Fix "FTBFS: tsort: cycle: ./Common: line 37:  2851 Aborted"
     This was a "false error" - the regression test is supposed to cause
     fped to abort, which it did, but the shell didn't print "Aborted" on
     that(Debian on Renesas SH(sh4) CPU) platform (Closes: #606536).
-  * update the homepage to help webpage, not svn source code page.
 
- -- Xiangfu Liu <xiangfu@openmobilefree.net>  Fri, 10 Dec 2010 15:51:58 +0800
+ -- Xiangfu Liu <xiangfu@openmobilefree.net>  Mon, 08 Oct 2012 11:38:57 +0800
 
 fped (0.0+r5986-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7fa1055..45f0206 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fped
 Section: electronics
 Priority: extra
 Maintainer: Xiangfu Liu <xiangfu@openmobilefree.net>
-Build-Depends: debhelper (>=  7.4.10), pkg-config, 
+Build-Depends: debhelper (>=  7.4.10), dpkg-dev (>= 1.16.1~), pkg-config,
  bash (>= 4), flex, bison,
  imagemagick, transfig, netpbm, ghostscript,
  libgtk2.0-dev
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 1d475d1..cefae60 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -6,7 +6,7 @@
 
 set -e
 
-: ${REPO=$(git rev-parse --git-dir)}
+: ${REPO=git://projects.qi-hardware.com/fped.git}
 : ${BRANCH=remotes/origin/master}
 
 mkdir debian-orig-source
@@ -26,5 +26,5 @@ upstream_version="${release}+${date}"
 
 # Generate tarball.
 echo "packaging $(git rev-parse --short FETCH_HEAD)"
-git archive FETCH_HEAD |
+git archive --format=tar --prefix="fped_${date}/" FETCH_HEAD |
 	gzip -n -9 >"fped_$upstream_version.orig.tar.gz"
diff --git a/debian/rules b/debian/rules
index 7eddc54..5a4006e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 export PREFIX=/usr
 
-build clean install binary-arch binary-indep binary:
-	+dh --parallel $(opt_no_act) $@
+%:
+	dh $@
 
 override_dh_auto_clean:
 	$(MAKE) spotless
@@ -19,29 +22,9 @@ override_dh_installchangelogs:
 		awk -f debian/changelog.upstream.awk
 	dh_installchangelogs debian/changelog.upstream
 
-opt_optimize = CFLAGS="-g -O2"
-opt_no_act =
-opt_quiet =
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    opt_optimize = CFLAGS="-g -O0"
-endif
-
-ifneq (,$(findstring n,$(MAKEFLAGS)))
-    opt_no_act = --no-act
-endif
-
-ifneq (,$(filter quiet,$(DEB_BUILD_OPTIONS)))
-    opt_quiet = --quiet
-    MAKEFLAGS += --quiet
-endif
-
 REPO = git://projects.qi-hardware.com/fped.git
 BRANCH = master
-debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:
 	REPO='$(REPO)' BRANCH='$(BRANCH)' \
-		sh '$(debiandir_SQ)'get-orig-source.sh
+		sh ./debian/get-orig-source.sh
 
-%:
-	dh $@