=== modified file 'INSTALL'
--- INSTALL	2016-03-09 21:23:21 +0000
+++ INSTALL	2016-03-13 00:37:02 +0000
@@ -42,7 +42,7 @@
     + Avahi 0.6.16        http://www.avahi.org/
     + Python 2.7          https://www.python.org/
     + dbus-python 0.82.4  http://dbus.freedesktop.org/doc/dbus-python/
-    + PyGObject 2.14.2    https://developer.gnome.org/pygobject/
+    + PyGObject 3.7.1     https://wiki.gnome.org/Projects/PyGObject
     + pkg-config  http://www.freedesktop.org/wiki/Software/pkg-config/
     + Urwid 1.0.1         http://urwid.org/
       (Only needed by the "mandos-monitor" tool.)

=== modified file 'init.d-mandos'
--- init.d-mandos	2016-03-08 00:03:43 +0000
+++ init.d-mandos	2016-03-13 00:37:02 +0000
@@ -77,9 +77,7 @@
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	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
+	start-stop-daemon --stop --quiet --retry=TERM/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'
--- mandos	2016-03-12 23:42:38 +0000
+++ mandos	2016-03-13 00:37:02 +0000
@@ -3200,8 +3200,9 @@
         del pidfile
         del pidfilename
     
-    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
-    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
+    for termsig in (signal.SIGHUP, signal.SIGTERM):
+        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
+                             lambda: main_loop.quit() and False)
     
     if use_dbus:
         

=== modified file 'mandos.service'
--- mandos.service	2016-03-08 00:03:43 +0000
+++ mandos.service	2016-03-13 00:37:02 +0000
@@ -28,9 +28,6 @@
 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