diff --git a/debian/changelog b/debian/changelog
index 4f39fac6..65047e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 byobu (5.4) unreleased; urgency=low
 
-  * UNRELEASED
+  [ Alexander Chernyakhovsky and Dustin Kirkland ]
+  * === added directory debian/source, debian/control, debian/install,
+    debian/rules, debian/source/format: LP: #917682
+    - switch to dh7 format for build
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 15 Jan 2012 13:54:17 -0600
 
diff --git a/debian/control b/debian/control
index fe04598e..efa7cd0b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,42 @@ Maintainer: Dustin Kirkland <kirkland@ubuntu.com>
 DM-Upload-Allowed: yes
 Uploaders: Antoine Beaupré <anarcat@koumbit.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 6), gettext-base, automake, autoconf
+Build-Depends: debhelper (>= 7), gettext-base, automake, autoconf
 Homepage: http://launchpad.net/byobu
 Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/byobu/trunk
 
 Package: byobu
 Architecture: all
-Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, gettext-base, python, python-newt (>= 0.52.2-11), tmux (>= 1.5) | screen
-Recommends: screen, tmux (>= 1.5)
-Suggests: apport, vim, w3m, po-debconf, update-notifier-common, lsb-release, run-one
-Provides: screen-profiles, screen-profiles-extras, byobu-extras
-Replaces: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0), byobu-extras (<< 2.17)
-Breaks: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0), byobu-extras (<< 2.17)
+Depends:
+ ${misc:Depends}, ${perl:Depends},
+ debconf (>= 0.5) | debconf-2.0,
+ gettext-base,
+ python,
+ python-newt (>= 0.52.2-11),
+ tmux (>= 1.5) | screen
+Recommends:
+ screen,
+ tmux (>= 1.5)
+Suggests:
+ apport,
+ lsb-release,
+ po-debconf,
+ run-one,
+ update-notifier-common,
+ vim,
+ w3m
+Provides:
+ screen-profiles,
+ screen-profiles-extras,
+ byobu-extras
+Replaces:
+ screen-profiles (<< 2.0),
+ screen-profiles-extras (<< 2.0),
+ byobu-extras (<< 2.17)
+Breaks:
+ screen-profiles (<< 2.0),
+ screen-profiles-extras (<< 2.0),
+ byobu-extras (<< 2.17)
 Enhances: screen
 Description: powerful, text based window manager and shell multiplexer
  Byobu is Ubuntu's text-based window manager based on GNU Screen.
diff --git a/debian/install b/debian/install
index cb3d7ff0..df6f6804 100644
--- a/debian/install
+++ b/debian/install
@@ -1,6 +1,4 @@
-/usr
-/etc/byobu/backend
-/etc/byobu/socketdir
-/etc/profile.d/Z97-byobu.sh
-../../debian/source_byobu.py usr/share/apport/package-hooks
-../../debian/lintian/byobu usr/share/lintian/overrides
+etc/byobu/socketdir etc/byobu/
+etc/byobu/backend etc/byobu/
+etc/profile.d/Z97-byobu.sh etc/profile.d/
+debian/source_byobu.py usr/share/apport/package-hooks
diff --git a/debian/rules b/debian/rules
index 7a7f9ac3..cbe925d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,77 +1,3 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-PKG=byobu
-VER=`head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//'`
-
-install-po: update-pot
-	for po in po/*.po ; do \
-		lang=$${po#po/}; lang=$${lang%.po}; \
-		mkdir -p debian/tmp/usr/share/locale/$${lang}/LC_MESSAGES/; \
-		msgfmt $${po} -o debian/tmp/usr/share/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
-	done
-
-update-pot:
-	rm -f po/${PKG}.pot
-	xgettext -f po/POTFILES.Shell -o po/${PKG}.pot -L Shell
-	xgettext -f po/POTFILES.Python -o po/${PKG}.pot -L Python -j
-	for po in po/*.po ; do \
-		msgmerge $${po} po/${PKG}.pot -o $${po} ; \
-	done
-
-autoconf: clean
-	dh_testdir
-	cp debian/changelog ChangeLog
-	aclocal
-	automake --add-missing --copy
-	autoconf
-
-prebuild: autoconf
-	./configure --prefix=/usr --sysconfdir=/etc
-
-build: prebuild
-	dh_testdir
-	$(MAKE)
-
-clean:
-	dh_testdir
-	dh_clean
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f ChangeLog
-	for po in po/*.po ; do \
-		lang=$${po#po/}; lang=$${lang%.po}; \
-		rm -f po/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
-	done
-
-install: build install-po
-	dh_testdir
-	dh_testroot
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	dh_link usr/share/byobu/keybindings/f-keys usr/share/byobu/keybindings/common
-	dh_link usr/share/byobu/pixmaps/byobu.svg usr/share/icons/hicolor/scalable/apps/byobu.svg
-	dh_link usr/bin/byobu usr/bin/byobu-screen
-	dh_link usr/bin/byobu usr/bin/byobu-tmux
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -X.bzr --fail-missing --sourcedir=debian/tmp -i
-	dh_installdocs -X.bzr -i
-	dh_installman -i
-	dh_installchangelogs -i
-	dh_installdebconf -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install prebuild
-
-binary-arch:
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)