diff -Nru android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.pre-start android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.pre-start
--- android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.pre-start	1970-01-01 00:00:00.000000000 +0000
+++ android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.pre-start	2016-10-05 11:31:23.000000000 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ -d /sys/class/android_usb ]; then
+  if [ -d /sys/class/android_usb/android0/f_ffs ] && \
+       [ -n "$(cat /sys/class/android_usb/android0/f_ffs/aliases)" ]; then
+    if ! $(mount|grep -q ^adb); then
+      # some devices use the functionfs (i.e. manta)
+      # we need to mount it to keep adb working
+      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 || true
+    fi
+  fi
+else
+  grep -q qemu /proc/cmdline || exit 1;
+fi
+
+exit 0
diff -Nru android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.service android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.service
--- android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.service	1970-01-01 00:00:00.000000000 +0000
+++ android-tools-5.1.1r36+git20160322/debian/android-tools-adbd.service	2016-10-05 11:31:23.000000000 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=adbd
+Wants=lxc-android-config.service
+After=lxc-android-config.service
+
+[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=android-container@ro.debuggable\\x3d1.target
diff -Nru android-tools-5.1.1r36+git20160322/debian/changelog android-tools-5.1.1r36+git20160322/debian/changelog
--- android-tools-5.1.1r36+git20160322/debian/changelog	2016-06-15 07:06:37.000000000 +0000
+++ android-tools-5.1.1r36+git20160322/debian/changelog	2016-10-05 11:32:15.000000000 +0000
@@ -1,3 +1,11 @@
+android-tools (5.1.1r36+git20160322-0ubuntu5) yakkety; urgency=medium
+
+  [ You-Sheng Yang ]
+  * debian/rules, debian/control, debian/android-tools-adbd.*:
+    - Install systemd service files
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 05 Oct 2016 13:32:02 +0200
+
 android-tools (5.1.1r36+git20160322-0ubuntu4) yakkety; urgency=medium
 
   * debian/control, debian/rules:
diff -Nru android-tools-5.1.1r36+git20160322/debian/control android-tools-5.1.1r36+git20160322/debian/control
--- android-tools-5.1.1r36+git20160322/debian/control	2016-06-15 07:05:12.000000000 +0000
+++ android-tools-5.1.1r36+git20160322/debian/control	2016-10-05 11:31:23.000000000 +0000
@@ -8,6 +8,7 @@
            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,
diff -Nru android-tools-5.1.1r36+git20160322/debian/rules android-tools-5.1.1r36+git20160322/debian/rules
--- android-tools-5.1.1r36+git20160322/debian/rules	2016-06-15 07:05:12.000000000 +0000
+++ android-tools-5.1.1r36+git20160322/debian/rules	2016-10-05 11:31:23.000000000 +0000
@@ -10,7 +10,7 @@
 INSTALL_PROGRAM = $(INSTALL)
 
 %:
-	dh $@ --with python2 --with bash-completion
+	dh $@ --with python2 --with bash-completion --with systemd
 
 override_dh_clean:
 	dh_clean
@@ -39,6 +39,8 @@
 
 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