diff --git a/Makefile.config.in b/Makefile.config.in
index 47d0d81cbf1..03d62903375 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -201,6 +201,9 @@ OBJ_ROOT := .
 # When ENABLE_DOXYGEN is enabled, the doxygen documentation will be built
 ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
 
+# Do we want to enable threads?
+ENABLE_THREADS := @ENABLE_THREADS@
+
 # This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #VERBOSE = 1
diff --git a/examples/Makefile b/examples/Makefile
index d71651deda4..a6530ee6f5a 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -10,7 +10,10 @@ LEVEL=..
 
 include $(LEVEL)/Makefile.config
 
-#PARALLEL_DIRS:= $(patsubst %/Makefile,%,$(wildcard $(SourceDir)/*/Makefile))
-PARALLEL_DIRS:= ParallelJIT Fibonacci HowToUseJIT ModuleMaker BFtoLLVM
+PARALLEL_DIRS:= Fibonacci HowToUseJIT ModuleMaker BFtoLLVM
+
+ifeq ($(ENABLE_THREADS),1)
+PARALLEL_DIRS += ParallelJIT 
+endif
 
 include $(LEVEL)/Makefile.common