diff --git a/Makefile.am b/Makefile.am
index 1d390745..ce7f92bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
 
+if NO_TESTAPPS
+SUBDIRS=lib
+else 
 SUBDIRS=lib test-server
+endif
 
 EXTRA_DIST=scripts/kernel-doc
 
diff --git a/README-test-server b/README-test-server
index bc9d65cb..a25f01e9 100644
--- a/README-test-server
+++ b/README-test-server
@@ -73,6 +73,8 @@ There are several other possible configure options
 			implementation into the library.  By default your libc
 			one is used.
 
+--without-testapps	Just build the library not the test apps
+
 
 Externally configurable important constants
 -------------------------------------------
diff --git a/configure.ac b/configure.ac
index 92d18499..60f74537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,17 @@ CFLAGS="$CFLAGS -DLWS_EXT_GOOGLE_MUX"
 fi
 AM_CONDITIONAL(EXT_GOOGLE_MUX, test x$x_google_mux = xyes)
 
-#                                                                               
+# 
+#
+#
+AC_ARG_WITH(testapps,
+ [  --without-testapps  dont build the libwebsocket-test- apps],
+ [ no_testapps=yes
+ ])
+
+AM_CONDITIONAL(NO_TESTAPPS, test x$no_testapps = xyes)
+
+
 #                                                                               
 #                                                                               
 AC_ARG_ENABLE(mingw,