diff --git a/debian/anbox-common.install b/debian/anbox-common.install
index 4700a8e..bf67a97 100644
--- a/debian/anbox-common.install
+++ b/debian/anbox-common.install
@@ -1,3 +1,4 @@
 etc/X11/Xsession.d/68anbox
 usr/share/upstart/sessions/anbox.conf
 usr/lib/systemd/user/anbox.service
+usr/lib/systemd/user/default.target.wants/anbox.service
diff --git a/scripts/clean-build.sh b/scripts/clean-build.sh
index b2de311..d7219d7 100755
--- a/scripts/clean-build.sh
+++ b/scripts/clean-build.sh
@@ -40,14 +40,26 @@ apt-get clean
 
 cd /anbox
 
-# In cases where anbox comes directly from a checked out Android
-# build environment we miss some symlinks which are present on
-# the host and don't have a valid git repository in that case.
-git clean -fdx . || true
-git reset --hard || true
+cleanup() {
+  # In cases where anbox comes directly from a checked out Android
+  # build environment we miss some symlinks which are present on
+  # the host and don't have a valid git repository in that case.
+  if [ -d .git ] ; then
+    git clean -fdx .
+    git reset --hard
+  fi
+}
+
+cleanup
 
 mkdir build || rm -rf build/*
 cd build
 cmake ..
 make -j10
 make test
+
+cleanup
+
+apt-get install -y build-essential curl devscripts gdebi-core dkms dh-systemd
+apt-get install -y $(gdebi --quiet --apt-line ./debian/control)
+debuild -us -uc