diff --git a/lib/cli.js b/lib/cli.js
index be4810a..68e44f8 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -23,5 +23,17 @@ module.exports = function() {
   // Initialize HAP-NodeJS with a custom persist directory
   hap.init(User.persistPath());
   
-  new Server(insecureAccess).run();
+  var server = new Server(insecureAccess);
+
+  var signals = { 'SIGINT': 2, 'SIGTERM': 15 };
+  Object.keys(signals).forEach(function (signal) {
+    process.on(signal, function () {
+      log.info("Got %s, shutting down Homebridge...", signal);
+
+      // FIXME: Shut down server cleanly
+      process.exit(128 + signals[signal]);
+    });
+  });
+
+  server.run();
 }