@@ -1226,11 +1226,14 @@
                        (let* ((rep       (start-nn-server portnum))
                            (mtconfdat (simple-setup (args:get-arg "-start-dir")))
                            (mtconf    (car mtconfdat))
                            (script    (configf:lookup mtconf "listener" "script")))
                            (print "Listening on port " portnum " for messages")
-                           (let loop ((instr (nn-recv rep)))
+														(set-signal-handler! signal/int  special-signal-handler)
+														(set-signal-handler! signal/term special-signal-handler)
+
+                            (let loop ((instr (nn-recv rep)))
                                (print "received " instr ", running \"" script " " instr "\"")
                                (system (conc script " '" instr "'"))
                                (nn-send rep "ok")
                                (loop (nn-recv rep))))
                      (print "ERROR: Port " portnum " already in use. Try another port")))))))