=== modified file 'mandos.service'
--- mandos.service	2014-10-05 19:39:25 +0000
+++ mandos.service	2015-06-02 17:43:53 +0000
@@ -7,11 +7,11 @@
 ## Type=dbus is not appropriate, because Mandos also needs to announce
 ## its ZeroConf service and be reachable on the network.
 #Type=dbus
+## Can't set the D-Bus name since we aren't Type=dbus
 #BusName=se.recompile.Mandos
-# If you add --no-dbus, also comment out BusName above, and vice versa
 ExecStart=/usr/sbin/mandos --foreground
 Restart=always
-KillMode=process
+KillMode=mixed
 ## Using socket activation won't work either, because systemd always
 ## does bind() on the socket, and also won't announce the ZeroConf
 ## service.