diff --git a/debian/android-tools-adbd.pre-start b/debian/android-tools-adbd.pre-start
new file mode 100755
index 0000000..1c2e476
--- /dev/null
+++ b/debian/android-tools-adbd.pre-start
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo Ubuntu           > /sys/class/android_usb/android0/iManufacturer
+echo Aquaris_M10_FHD  > /sys/class/android_usb/android0/iProduct
+echo 0123456789ABCDEF > /sys/class/android_usb/android0/iSerial
+echo 1                > /sys/class/android_usb/android0/f_rndis/wceis
+echo Ubuntu           > /sys/class/android_usb/android0/f_rndis/manufacturer
+echo 0E8D             > /sys/class/android_usb/android0/f_rndis/vendorID
+
+mkdir -p /dev/usb-ffs/adb
+chown phablet:phablet -R /dev/usb-ffs
+mount -o uid=32011,gid=32011 -t functionfs adb /dev/usb-ffs/adb
+
+echo adb  > /sys/class/android_usb/android0/f_ffs/aliases
+echo 0    > /sys/class/android_usb/android0/enable
+echo 2A47 > /sys/class/android_usb/android0/idVendor
+echo 201C > /sys/class/android_usb/android0/idProduct
+echo adb  > /sys/class/android_usb/android0/functions
+echo 1    > /sys/class/android_usb/android0/enable
+
+exit 0
diff --git a/debian/android-tools-adbd.service b/debian/android-tools-adbd.service
new file mode 100644
index 0000000..970abed
--- /dev/null
+++ b/debian/android-tools-adbd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=adbd
+After=local-fs.target
+
+[Service]
+Type=simple
+Restart=on-failure
+SuccessExitStatus=0 127
+ExecStartPre=/usr/lib/android-tools-adbd/pre-start
+ExecStart=/bin/su - -c /usr/bin/adbd
+ExecStopPost=/usr/bin/unlink /dev/socket/adbd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/control b/debian/control
index ae54b55..2ce8a34 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,17 @@ Section: devel
 Priority: extra
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
 Uploaders: Loïc Minier <lool@debian.org>,
            Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
            Simon Fels <simon.fels@canonical.com>
            Ondrej Kubik <ondrej.kubik@canonical.com>
 Build-Depends: debhelper (>= 9),
+               dh-systemd,
                gir1.2-glib-2.0,
                libglib2.0-dev,
                libselinux-dev,
                libhybris-dev [i386 amd64 armhf arm64],
                libsystemd-dev,
                libssl-dev,
                python,
                zlib1g-dev,
diff --git a/debian/rules b/debian/rules
index 900e70a..5a0c411 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,17 +5,17 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export CC := $(DEB_HOST_GNU_TYPE)-gcc
 
 M := $(CURDIR)/debian/makefiles
 
 INSTALL := install
 INSTALL_PROGRAM = $(INSTALL)
 
 %:
-	dh $@ --with python2 --with bash-completion
+	dh $@ --with python2 --with bash-completion --with systemd
 
 override_dh_clean:
 	dh_clean
 	mkdir -p core/build_adb
 	$(MAKE) -f $(M)/adb.mk -C core/build_adb clean
 ifeq (,$(filter $(DEB_HOST_ARCH),powerpc s390x ppc64el))
 		mkdir -p core/build_adbd
 		$(MAKE) -f $(M)/adbd.mk -C core/build_adbd clean
@@ -34,16 +34,18 @@ ifeq (,$(filter $(DEB_HOST_ARCH),powerpc s390x ppc64el))
 endif
 	mkdir -p core/build_ext4_utils
 	$(MAKE) -f $(M)/ext4_utils.mk -C core/build_ext4_utils
 	mkdir -p core/build_fastboot
 	$(MAKE) -f $(M)/fastboot.mk -C core/build_fastboot
 
 override_dh_install:
 	dh_install --sourcedir=.
+	mkdir -p debian/android-tools-adbd/usr/lib/android-tools-adbd
+	$(INSTALL_PROGRAM) debian/android-tools-adbd.pre-start debian/android-tools-adbd/usr/lib/android-tools-adbd/pre-start
 	$(INSTALL_PROGRAM) core/libsparse/simg_dump.py debian/android-tools-fsutils/usr/bin/simg_dump
 	$(INSTALL_PROGRAM) extras/ext4_utils/mkuserimg.sh debian/android-tools-fsutils/usr/bin/mkuserimg
 	$(INSTALL_PROGRAM) extras/ext4_utils/mkubuntuimg.sh debian/android-tools-fsutils/usr/bin/mkubuntuimg
 
 override_dh_installudev:
 	dh_installudev -p android-tools-adb --priority=70
 	dh_installudev -p android-tools-fastboot --priority=70
 	dh_installudev -p android-tools-adbd --priority=98