diff --git a/configure.ac b/configure.ac
index c6408dcc4..645a29aac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,12 +500,27 @@ AC_ARG_ENABLE(crl,
 
 if test "$ENABLED_CRL" = "yes"
 then
-    AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL -DHAVE_CRL_MONITOR"
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL"
 fi
 
 AM_CONDITIONAL([BUILD_CRL], [test "x$ENABLED_CRL" = "xyes"])
 
 
+# CRL Monitor
+AC_ARG_ENABLE(crl-monitor,
+    [  --enable-crl-monitor    Enable CRL Monitor (default: disabled)],
+    [ ENABLED_CRL_MONITOR=$enableval ],
+    [ ENABLED_CRL_MONITOR=no ],
+    )
+
+if test "$ENABLED_CRL_MONITOR" = "yes"
+then
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_MONITOR"
+fi
+
+AM_CONDITIONAL([BUILD_CRL_MONITOR], [test "x$ENABLED_CRL_MONITOR" = "xyes"])
+
+
 # NTRU
 ntruHome=`pwd`/NTRU_algorithm
 ntruInclude=$ntruHome/cryptolib
diff --git a/src/crl.c b/src/crl.c
index 136427757..40759a4f1 100644
--- a/src/crl.c
+++ b/src/crl.c
@@ -492,6 +492,9 @@ static int StartMonitorCRL(CYASSL_CRL* crl)
 
 static int StartMonitorCRL(CYASSL_CRL* crl)
 {
+    CYASSL_ENTER("StartMonitorCRL");
+    CYASSL_MSG("Not compiled in");
+
     return NOT_COMPILED_IN;
 }
 
diff --git a/src/include.am b/src/include.am
index 95c7c026d..60037f766 100644
--- a/src/include.am
+++ b/src/include.am
@@ -72,6 +72,9 @@ endif
 
 if BUILD_CRL
 src_libcyassl_la_SOURCES += src/crl.c
+endif
+
+if BUILD_CRL_MONITOR
 src_libcyassl_la_CFLAGS += $(PTHREAD_CFLAGS)
 src_libcyassl_la_LIBADD += $(PTHREAD_LIBS)
 endif