diff --git a/Makefile.am b/Makefile.am
index e1f4bc0..6d35f6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,4 @@ include_HEADERS = stabber.h
 noinst_PROGRAMS = runstabber
 runstabber_SOURCES = runstabber.c
 runstabber_CFLAGS = -I$(top_srcdir)
-runstabber_LDADD = libstabber.la
+runstabber_LDADD = libstabber.la -lpthread
diff --git a/runstabber.c b/runstabber.c
index edc18aa..856ab45 100644
--- a/runstabber.c
+++ b/runstabber.c
@@ -1,7 +1,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <stabber.h>
-
+#include <pthread.h>
 
 int
 main(int argc , char *argv[])
@@ -37,5 +37,7 @@ main(int argc , char *argv[])
         port = atoi(argv[1]);
     }
 
-    return stbbr_main(port);
+    stbbr_start(port);
+
+    pthread_exit(0);
 }
diff --git a/src/client/stabber.c b/src/client/stabber.c
index 2cd22ee..b42b55e 100644
--- a/src/client/stabber.c
+++ b/src/client/stabber.c
@@ -9,11 +9,6 @@ typedef struct server_args_t {
     int port;
 } StabberArgs;
 
-int
-stbbr_main(int port)
-{
-    return server_run(port);
-}
 
 int
 stbbr_start(int port)
diff --git a/stabber.h b/stabber.h
index 89cc58a..cf8554f 100644
--- a/stabber.h
+++ b/stabber.h
@@ -1,7 +1,6 @@
 #ifndef __H_STABBER
 #define __H_STABBER
 
-int stbbr_main(int port);
 int stbbr_start(int port);
 
 int stbbr_auth_passwd(char *password);