diff --git a/phoned/main.c b/phoned/main.c
index 29c2e1a..92e2744 100644
--- a/phoned/main.c
+++ b/phoned/main.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <unistd.h>
+#include <pthread.h>
 
 #include <phoned.h>
 extern struct conf cf;
@@ -49,5 +50,6 @@ int main(argc, argv)
 	initialize();
 	network();
 	shutd();
+	pthread_exit(NULL);
 	return 0;
 }
diff --git a/phoned/socket.c b/phoned/socket.c
index a38a0cd..3b5345e 100644
--- a/phoned/socket.c
+++ b/phoned/socket.c
@@ -76,6 +76,7 @@ void *handclient(k)
 		cid_log(rc);
 	}
 	close(sk);
+	pthread_exit(NULL);
 	return 0;
 }