diff -Nru 389-admin-1.1.42/debian/389-admin.dirsrv-admin.init 389-admin-1.1.42/debian/389-admin.dirsrv-admin.init
--- 389-admin-1.1.42/debian/389-admin.dirsrv-admin.init	2015-07-10 08:41:29.000000000 +0000
+++ 389-admin-1.1.42/debian/389-admin.dirsrv-admin.init	2016-04-15 11:17:27.000000000 +0000
@@ -4,7 +4,7 @@
 
 ### BEGIN INIT INFO
 # Provides:          dirsrv-admin
-# Required-Start:    $remote_fs dirsrv
+# Required-Start:    $remote_fs
 # Required-Stop:     $remote_fs
 # Should-Start:      $network
 # Should-Stop:       $network
diff -Nru 389-admin-1.1.42/debian/389-admin.dirsrv-admin.service 389-admin-1.1.42/debian/389-admin.dirsrv-admin.service
--- 389-admin-1.1.42/debian/389-admin.dirsrv-admin.service	1970-01-01 00:00:00.000000000 +0000
+++ 389-admin-1.1.42/debian/389-admin.dirsrv-admin.service	2016-04-13 21:39:29.000000000 +0000
@@ -0,0 +1,19 @@
+[Unit]
+Description=389 Administration Server.
+After=network.target dirsrv.target
+
+[Service]
+Type=forking
+PIDFile=/run/dirsrv/admin-serv.pid
+# to set the kerberos keytab
+# Environment=KRB5_KTNAME=/etc/dirsrv/myname.keytab
+EnvironmentFile=/etc/default/dirsrv-admin
+ExecStart=/usr/sbin/apache2 -k start -f /etc/dirsrv/admin-serv/httpd.conf
+ExecReload=/usr/sbin/apache2 -t
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/usr/sbin/apache2 $OPTIONS -k stop
+# to raise the file descriptor limit
+# LimitNOFILE=8192
+
+[Install]
+WantedBy=multi-user.target
diff -Nru 389-admin-1.1.42/debian/changelog 389-admin-1.1.42/debian/changelog
--- 389-admin-1.1.42/debian/changelog	2015-07-10 09:40:02.000000000 +0000
+++ 389-admin-1.1.42/debian/changelog	2016-04-15 11:23:52.000000000 +0000
@@ -1,3 +1,18 @@
+389-admin (1.1.42-2) unstable; urgency=medium
+
+  * Migrate to systemd
+    - 389-admin.dirsrv-admin.service, rules: Add a unit file.
+    - control, rules: Add dh-systemd to build-depends
+  * init: Drop hard dependency on dirsrv. (Closes: #820018)
+  * rules: Enable parallel builds.
+  * rules: Pass --fail-missing to dh_install.
+    - libds-admin-serv0.{install,links.in}, rules: Remove .so, install
+      .so.0 provided by upstream, drop .links.in
+    - rules: Remove upstream initscript
+  * control: Add libcgi-pm-perl to Depends.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 15 Apr 2016 14:23:50 +0300
+
 389-admin (1.1.42-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru 389-admin-1.1.42/debian/control 389-admin-1.1.42/debian/control
--- 389-admin-1.1.42/debian/control	2015-07-10 08:41:29.000000000 +0000
+++ 389-admin-1.1.42/debian/control	2016-04-13 22:52:16.000000000 +0000
@@ -9,6 +9,7 @@
  debconf-utils,
  debhelper (>= 9),
  dh-autoreconf,
+ dh-systemd,
  libadminutil-dev,
  libapache2-mod-nss,
  libicu-dev,
@@ -48,6 +49,7 @@
  389-ds-base,
  apache2,
  libapache2-mod-nss,
+ libcgi-pm-perl,
  libds-admin-serv0 (= ${binary:Version}),
  libmozilla-ldap-perl,
  libnss3-tools,
diff -Nru 389-admin-1.1.42/debian/libds-admin-serv0.install 389-admin-1.1.42/debian/libds-admin-serv0.install
--- 389-admin-1.1.42/debian/libds-admin-serv0.install	2015-07-10 08:41:29.000000000 +0000
+++ 389-admin-1.1.42/debian/libds-admin-serv0.install	2016-04-13 19:10:03.000000000 +0000
@@ -1 +1,2 @@
 usr/lib/*/libds-admin-serv.so.0.0.0
+usr/lib/*/libds-admin-serv.so.0
diff -Nru 389-admin-1.1.42/debian/libds-admin-serv0.links.in 389-admin-1.1.42/debian/libds-admin-serv0.links.in
--- 389-admin-1.1.42/debian/libds-admin-serv0.links.in	2015-07-10 08:41:29.000000000 +0000
+++ 389-admin-1.1.42/debian/libds-admin-serv0.links.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/@MULTIARCH@/libds-admin-serv.so.0.0.0 usr/lib/@MULTIARCH@/libds-admin-serv.so.0
diff -Nru 389-admin-1.1.42/debian/patches/fix-linking.patch 389-admin-1.1.42/debian/patches/fix-linking.patch
--- 389-admin-1.1.42/debian/patches/fix-linking.patch	2015-07-10 08:43:06.000000000 +0000
+++ 389-admin-1.1.42/debian/patches/fix-linking.patch	2016-04-13 22:42:59.000000000 +0000
@@ -5,9 +5,24 @@
 
     libds-admin-serv.so didn't link against libldap2 though it used it's symbols
 
+    and drop libs that are not used
+
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -283,6 +283,7 @@ update_SCRIPTS = admserv/makeUpgradeTar.
+@@ -151,10 +151,8 @@ else
+ LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
+ ADMINUTIL_LINK = @adminutil_lib@ @nspr_lib@ @nss_lib@ @sasl_lib@ @ldapsdk_lib@ @icu_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@
+ endif
+-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
+-NSS_LINK = @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3
+-SASL_LINK = @sasl_lib@ -lsasl2
+-ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
++NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4
++NSS_LINK = @nss_lib@ -lsmime3 -lssl3 -lnss3
+ 
+ DEFAULT_LIBS_NOCGI = $(ADMINUTIL_LINK) \
+                      $(ICU_LINK) \
+@@ -283,6 +281,7 @@ update_SCRIPTS = admserv/makeUpgradeTar.
  libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
  libds_admin_serv_la_LINK = $(MYLINK)
  libds_admin_serv_la_LIBADD = $(ADMINUTIL_LINK) \
diff -Nru 389-admin-1.1.42/debian/rules 389-admin-1.1.42/debian/rules
--- 389-admin-1.1.42/debian/rules	2015-07-10 08:41:29.000000000 +0000
+++ 389-admin-1.1.42/debian/rules	2016-04-15 11:03:01.000000000 +0000
@@ -11,8 +11,6 @@
 	CPPFLAGS=-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-LDFLAGS += -L/usr/lib/$(DEB_HOST_MULTIARCH)/nss
-
 # Deterministic "build number". Format is defined in ./buildnum.pl
 BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date)
 BUILDNUM := $(shell date --utc --date="$(BUILD_DATE)" +%Y.%j.%H%M)
@@ -22,7 +20,6 @@
 		--disable-rpath \
 		--with-openldap \
 		--with-httpd=/usr/sbin/apache2 \
-		--with-initddir=/etc/init.d \
 		--with-apxs=/usr/bin/apxs2
 
 override_dh_auto_build:
@@ -34,6 +31,9 @@
 override_dh_install:
 	# purge .la files
 	find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \;
+	# and others
+	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.so
+	rm -f $(CURDIR)/debian/tmp/etc/rc.d/init.d/dirsrv-admin
 
 	# rename the binaries & manpages, don't need wrappers
 	rename 's,.pl$$,,' $(CURDIR)/debian/tmp/usr/sbin/*.pl
@@ -41,12 +41,10 @@
 
 	chmod -x $(CURDIR)/debian/tmp/etc/default/* \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dirsrv/perl/*
-	dh_install
+	dh_install --fail-missing
 
-override_dh_link:
-	sed -e"s/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" \
-		debian/libds-admin-serv0.links.in > debian/libds-admin-serv0.links
-	dh_link
+override_dh_systemd_enable:
+	dh_systemd_enable -p389-admin --no-enable --name=dirsrv-admin dirsrv-admin.service
 
 override_dh_installinit:
 	dh_installinit --name dirsrv-admin -- defaults 15 85
@@ -55,4 +53,4 @@
 	dh_shlibdeps -l"debian/389-admin/usr/lib/$(DEB_HOST_MULTIARCH)/:debian/389-admin/usr/lib/$(DEB_HOST_MULTIARCH)/dirsrv"
 
 %:
-	dh $@ --with quilt,autoreconf --builddir build/
+	dh $@ --with quilt,autoreconf,systemd --parallel --builddir build/