--- a/src/core/main.c	2015-01-11 02:37:56.955735182 +0200
+++ b/src/core/main.c	2015-01-11 02:34:48.526483575 +0200
@@ -1824,6 +1824,7 @@
 finish:
         pager_close();
 
+        arg_shutdown_watchdog = m->shutdown_watchdog;
         m = manager_free(m);
 
         for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) {