=== modified file 'init.d-mandos'
--- init.d-mandos	2014-01-06 15:56:54 +0000
+++ init.d-mandos	2016-03-08 00:03:43 +0000
@@ -77,7 +77,9 @@
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE --name $NAME
+	mandos-ctl >/dev/null 2>&1
+	start-stop-daemon --stop --quiet --retry=30/KILL/5 --pidfile $PIDFILE --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks

=== modified file 'mandos.service'
--- mandos.service	2016-03-07 23:39:36 +0000
+++ mandos.service	2016-03-08 00:03:43 +0000
@@ -28,6 +28,9 @@
 ProtectSystem=full
 ProtectHome=yes
 CapabilityBoundingSet=CAP_KILL CAP_SETGID CAP_SETUID CAP_DAC_OVERRIDE CAP_NET_RAW
+# Bug workaround; the daemon does not stop on SIGTERM until poked via
+# D-Bus; cause is unknown at this time
+ExecStop=/bin/kill -TERM $MAINPID ; /usr/sbin/mandos-ctl >/dev/null 2>&1
 
 [Install]
 WantedBy=multi-user.target