diff -Nru apache-directory-server-2.0.0~M24/debian/apacheds.postinst apache-directory-server-2.0.0~M24/debian/apacheds.postinst
--- apache-directory-server-2.0.0~M24/debian/apacheds.postinst	2018-10-27 14:30:27.000000000 +0000
+++ apache-directory-server-2.0.0~M24/debian/apacheds.postinst	2019-02-22 14:31:54.000000000 +0000
@@ -32,7 +32,9 @@
         # Fix directory permissions
         chown -Rh $APACHEDS_USER:$APACHEDS_GROUP /var/log/apacheds || true
         chown -Rh $APACHEDS_USER:$APACHEDS_GROUP /var/lib/apacheds || true
+        chown root:$APACHEDS_GROUP /etc/apacheds
         chown $APACHEDS_USER:$APACHEDS_GROUP /etc/apacheds/*
+        chmod 2770 /etc/apacheds
         chmod 640 /etc/apacheds/*
     ;;
 
diff -Nru apache-directory-server-2.0.0~M24/debian/apacheds.service apache-directory-server-2.0.0~M24/debian/apacheds.service
--- apache-directory-server-2.0.0~M24/debian/apacheds.service	2018-10-27 14:30:27.000000000 +0000
+++ apache-directory-server-2.0.0~M24/debian/apacheds.service	2019-02-22 14:31:54.000000000 +0000
@@ -1,7 +1,8 @@
 [Unit]
 Description=Apache Directory Server
 After=network.target
-ConditionPathExists=/etc/apacheds/config.ldif
+ConditionPathExists=|/etc/apacheds/config.ldif
+ConditionPathIsDirectory=|/etc/apacheds/ou=config
 
 [Service]
 Type=simple
diff -Nru apache-directory-server-2.0.0~M24/debian/changelog apache-directory-server-2.0.0~M24/debian/changelog
--- apache-directory-server-2.0.0~M24/debian/changelog	2018-10-27 14:30:27.000000000 +0000
+++ apache-directory-server-2.0.0~M24/debian/changelog	2019-02-22 14:31:54.000000000 +0000
@@ -1,3 +1,17 @@
+apache-directory-server (2.0.0~M24-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Dominik George ]
+  * Fix mistake in dependency.
+
+  [ tony mancill ]
+  * Make /etc/apacheds writable by app user in postinst and modify
+    conditions in systemd unit file for service start. (Closes: #921953)
+    Thank you to Johan Grip for the bug report and patch.
+
+ -- tony mancill <tmancill@debian.org>  Fri, 22 Feb 2019 06:31:54 -0800
+
 apache-directory-server (2.0.0~M24-2) unstable; urgency=medium
 
   * Team upload.