diff --git a/configure.ac b/configure.ac
index 27e86a57..dd2ec7d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2023,6 +2023,16 @@ AC_SUBST([EMPTY_VAR], [[]])
 AC_DEFINE_DIR([MHD_PLUGIN_INSTALL_PREFIX], [libdir/libmicrohttpd], [tls plugins])
 
 
+# should experimental code be compiled (code that may not yet compile)?
+AC_MSG_CHECKING(whether to compile experimental code)
+AC_ARG_ENABLE([experimental],
+   [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])],
+   [enable_experimental=${enableval}],
+   [enable_experimental=no])
+AC_MSG_RESULT($enable_experimental)
+AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
+
+
 AC_CONFIG_FILES([libmicrohttpd.pc
 w32/common/microhttpd_dll_res_vc.rc
 Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7cdcace0..ee9c3fcb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,9 @@ SUBDIRS += examples
 endif
 
 # Finally (last!) also build experimental lib...
+if HAVE_EXPERIMENTAL
 SUBDIRS += lib
+endif
 
 EXTRA_DIST = \
  datadir/cert-and-key.pem \