diff --git a/src/main.c b/src/main.c
index 0aedce2..55d08e0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,6 +13,10 @@
 #define MODE_SERVER 0
 #define MODE_CLIENT 1
 
+void die() {
+	cleanup_display();
+	exit(1);
+}
 
 int parseArgs(struct prog_info *pinfo, int argc, char **argv) {
 	pinfo->mode = MODE_SERVER;
@@ -129,7 +133,8 @@ int main(int argc, char **argv) {
 			ret = run_server(&prog_info, image, w, h);
 		} else {
 			printf("running in CLIENT mode, using client number %d\n", prog_info.client_offset);
-			signal(SIGINT,&cleanup_display);
+			signal(SIGINT,&die);
+			signal(SIGTERM,&die);
 			ret = run_client(&prog_info, callback);
 		}