diff -r 50505dc3f8a6 -r f5102a892ed4 src/server/daemon/main.c
--- a/src/server/daemon/main.c	Sun May 26 22:05:41 2013 +0200
+++ b/src/server/daemon/main.c	Mon May 27 12:28:56 2013 +0200
@@ -71,6 +71,7 @@
  * SIGTERM: stop the server
  */
 void sig_term(int sig) {
+    webserver_shutdown();
     exit(EXIT_SUCCESS);
 }
 
@@ -91,7 +92,7 @@
 
 int main(int argc, char **argv) {
     //test();
-
+    
     /* if the -c parameter is specified, we don't create a daemon */
     int d = 1;
     for(int i=0;i<argc;i++) {
@@ -141,6 +142,7 @@
     /* add signal handler */
     signal(SIGUSR1, sig_usr1_reload);
     signal(SIGTERM, sig_term);
+    signal(SIGINT, sig_term);
 
     /* start webserver */
     int status;