=== modified file 'TODO'
--- TODO	2015-07-06 20:29:34 +0000
+++ TODO	2015-07-07 15:49:49 +0000
@@ -32,7 +32,7 @@
 ** TODO [#B] use scandir(3) instead of readdir(3)
 
 * usplash (Deprecated)
-** TODO [#A] Make it work again
+** TODO [#B] Make it work again
 ** TODO [#B] use scandir(3) instead of readdir(3)
 
 * askpass-fifo
@@ -92,7 +92,6 @@
 ** TODO init.d script error handling
 ** TODO D-Bus server properties; address, port, interface, etc.		     :2:
 ** TODO [#C] In Python 3.3, use shlex.quote() instead of re.escape()
-** TODO [#A] USe systemd Type=dbus
 
 * mandos.xml
 ** Add mandos contact info in manual pages

=== modified file 'mandos.service'
--- mandos.service	2015-06-02 17:43:53 +0000
+++ mandos.service	2015-07-07 15:49:49 +0000
@@ -3,18 +3,12 @@
 Documentation=man:intro(8mandos) man:mandos(8)
 
 [Service]
-Type=simple
-## 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
+BusName=se.recompile.Mandos
 ExecStart=/usr/sbin/mandos --foreground
 Restart=always
 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.
+## Using socket activation won't work, because systemd always does
+## bind() on the socket, and also won't announce the ZeroConf service.
 #ExecStart=/usr/sbin/mandos --foreground --socket=0
 #StandardInput=socket