diff --git a/buildbox/agent.go b/buildbox/agent.go
index 8e489a9fa1..9fdd497b40 100644
--- a/buildbox/agent.go
+++ b/buildbox/agent.go
@@ -68,7 +68,15 @@ func (a *Agent) Setup() {
 func (a *Agent) MonitorSignals() {
   // Handle signals
   signals := make(chan os.Signal, 1)
-  signal.Notify(signals, syscall.SIGINT, syscall.SIGUSR2)
+
+  // Monitor a heap of different signals for debugging purposes. Only
+  // some of them are used.
+  signal.Notify(signals, os.Interrupt,
+                         syscall.SIGHUP,
+                         syscall.SIGTERM,
+                         syscall.SIGQUIT,
+                         syscall.SIGINT,
+                         syscall.SIGUSR2)
 
   go func() {
     // This will block until a signal is sent
@@ -76,6 +84,16 @@ func (a *Agent) MonitorSignals() {
 
     log.Printf("Received signal `%s`", sig.String())
 
+    // Only monitor certain signals
+    if sig != syscall.SIGINT && sig != syscall.SIGUSR2 {
+      log.Printf("Ignoring signal `%s`", sig.String())
+
+      // Start monitoring signals again
+      a.MonitorSignals()
+
+      return
+    }
+
     // If the agent isn't running a job, exit right away
     if a.Job == nil {
       log.Printf("No jobs running. Exiting...")
diff --git a/buildbox/version.go b/buildbox/version.go
index 833ff7cc91..dd404c173c 100644
--- a/buildbox/version.go
+++ b/buildbox/version.go
@@ -1,5 +1,5 @@
 package buildbox
 
 const (
-  Version = "0.2-beta.1"
+  Version = "0.2-beta.2"
 )