diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e8087b6b044da45212f200988b74ce33b78c5d5a
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+include: "https://git.autistici.org/ai3/build-deb/raw/master/ci-common.yml"
+
+# debian/patches patches are kept applied in the tree, no need to
+# double-apply them when building the source package.
+# Thus remove the patches altogether and build an original tarball out of HEAD.
+build_pkgsrc:stretch:
+  script:
+    - rm -rf debian/patches
+    - git archive --prefix orig/ --output ../$(dpkg-parsechangelog -SSource)_$(dpkg-parsechangelog -SVersion | sed -e  's/-[^-]*$//' -e 's/^[0-9]*://').orig.tar.gz HEAD
+    # nicer version with git-buildpackage >= 0.9.8
+    #- gbp export-orig  --upstream-tag=HEAD
+    - build-dsc
diff --git a/debian/control b/debian/control
index b96d017b795ea77cb8ffc0a0a6fb4eecd6a9cda1..637aa9789b877e8f35f686a1f8ef03b2c31630a2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: mail
 Priority: optional
 Maintainer: Mailman for Debian <pkg-mailman-hackers@lists.alioth.debian.org>
 Uploaders: Thijs Kinkhorst <thijs@debian.org>,
-Build-Depends: debhelper (>= 11), autoconf, python-dev,
- gettext, python-dnspython, dh-python
+Build-Depends: debhelper (>= 10), autoconf, python-dev,
+ gettext, python-dnspython, dh-python, dh-systemd
 Standards-Version: 4.1.4
 Homepage: http://www.list.org/
 Vcs-Git: https://salsa.debian.org/mailman-team/mailman2.git
diff --git a/debian/rules b/debian/rules
index 436bf654b56d9a1eda857a66140ceb58c1894ee0..3e27bae630e7e4126f1e2ac5ceeb8a00f963d4a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,7 +121,8 @@ binary-arch:	build
 		do dh_link usr/lib/$(package)/bin/$$bin usr/sbin/$$bin; done
 	mv debian/mailman/usr/sbin/arch debian/mailman/usr/sbin/mmarch
 	dh_installman
-	dh_installsystemd
+	dh_systemd_enable
+	dh_systemd_start
 	dh_installdebconf
 	dh_installexamples templates/* debian/mm_cfg.py \
 		debian/mailman/usr/lib/$(package)/Mailman/Defaults.py