diff --git a/src/webserver.js b/src/webserver.js
index 01a779e972..0d65b7c99e 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -44,6 +44,16 @@ if(nconf.get('ssl')) {
 
 module.exports.server = server;
 
+// Signals
+process.on('SIGINT', function() {
+	winston.info('[app] Shutdown Initialised.');
+	db.close();
+	winston.info('[app] Database connection closed.');
+
+	winston.info('[app] Goodbye!');
+	process.exit();
+});
+
 (function (app) {
 	"use strict";