diff --git a/debian/rules b/debian/rules
index 01a7043..6afaad1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ export COMPILE_DATE ?= $(shell date -u --date="`dpkg-parsechangelog|grep ^Date|h
 DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
 %:
-	dh $@ -with autotools_dev,autoreconf
+	dh $@ -with autotools_dev,autoreconf,systemd
 
 override_dh_auto_configure:
 	./autogen.sh
@@ -43,8 +43,8 @@ endif
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
 override_dh_install:
 	cp apparmor-profile debian/tlsdate/etc/apparmor.d/usr.bin.tlsdate
-	# use copy from debian/tlsdated.service as long as upstream file is broken:
-	cp debian/tlsdated.service debian/tlsdate/lib/systemd/system/
+	cp systemd/tlsdated.service debian/tlsdate/lib/systemd/system/
+	cp systemd/tlsdated.default debian/tlsdate/etc/default/tlsdated
 	dh_apparmor --profile-name=usr.bin.tlsdate -ptlsdate
 override_dh_installinit:
 	dh_installinit --name=tlsdated
diff --git a/debian/tlsdate.dirs b/debian/tlsdate.dirs
index 1622206..b9b0fc3 100644
--- a/debian/tlsdate.dirs
+++ b/debian/tlsdate.dirs
@@ -2,3 +2,4 @@ etc/apparmor.d
 etc/tlsdate
 var/cache/tlsdated
 lib/systemd/system
+etc/default
diff --git a/debian/tlsdated.service b/debian/tlsdated.service
deleted file mode 100644
index 5515a8e..0000000
--- a/debian/tlsdated.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Secure parasitic time daemon
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/default/tlsdated
-ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS}
-ExecReload=/bin/kill -HUP ${MAINPID}
-ExecStop=/bin/kill -INT ${MAINPID}
diff --git a/debian/tlsdated.default b/systemd/tlsdated.default
similarity index 100%
rename from debian/tlsdated.default
rename to systemd/tlsdated.default
diff --git a/systemd/tlsdated.service b/systemd/tlsdated.service
index 5515a8e..f70c156 100644
--- a/systemd/tlsdated.service
+++ b/systemd/tlsdated.service
@@ -5,6 +5,6 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=/etc/default/tlsdated
-ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS}
-ExecReload=/bin/kill -HUP ${MAINPID}
-ExecStop=/bin/kill -INT ${MAINPID}
+ExecStart=/usr/sbin/tlsdated $DAEMON_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -INT $MAINPID