diff --git a/server.go b/server.go
index 680c6aeb97..a5ab4f2646 100644
--- a/server.go
+++ b/server.go
@@ -38,7 +38,7 @@ func init() {
 
 // jobInitApi runs the remote api server `srv` as a daemon,
 // Only one api server can run at the same time - this is enforced by a pidfile.
-// The signals SIGINT and SIGTERM are intercepted for cleanup.
+// The signals SIGINT, SIGQUIT and SIGTERM are intercepted for cleanup.
 func jobInitApi(job *engine.Job) engine.Status {
 	job.Logf("Creating server")
 	// FIXME: ImportEnv deprecates ConfigFromJob
@@ -56,7 +56,7 @@ func jobInitApi(job *engine.Job) engine.Status {
 	}
 	job.Logf("Setting up signal traps")
 	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, os.Signal(syscall.SIGTERM))
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT)
 	go func() {
 		sig := <-c
 		log.Printf("Received signal '%v', exiting\n", sig)