diff --git a/.gitignore b/.gitignore
index 5c2a2499..de99ef56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ doc/_build/
 pkgs/
 .coverage
 __pycache__
+debian/changelog.*
diff --git a/Makefile b/Makefile
index 1935438f..5f97ebd0 100644
--- a/Makefile
+++ b/Makefile
@@ -20,3 +20,5 @@ clean:
 	rm -rf qubesadmin/*/__pycache__ qubesadmin/tests/*/__pycache__
 	rm -rf test-packages/*.egg-info
 	rm -f .coverage
+	rm -rf debian/changelog.*
+	rm -rf pkgs
diff --git a/debian/rules b/debian/rules
index 30aae5b4..b71d9100 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,10 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
+
 export PYBUILD_NAME = qubesadmin
 
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-# main packaging script based on dh7 syntax
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
@@ -31,6 +17,9 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
+	mkdir -p debian/qubes-core-admin-client/etc/xdg/autostart
+	install -m 0644 etc/qvm-start-daemon.desktop \
+		debian/qubes-core-admin-client/etc/xdg/autostart/
 	mkdir -p debian/qubes-core-admin-client/usr/bin
 	mv debian/python3-qubesadmin/usr/bin/* debian/qubes-core-admin-client/usr/bin/
 	install -d debian/qubes-core-admin-client/usr/share/man/man1
@@ -41,12 +30,3 @@ override_dh_clean:
 	dh_clean -O--buildsystem=pybuild
 	make clean
 
-# debmake generated override targets
-# This is example for Cmake (See http://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-
-
-