diff --git a/configure b/configure
index 8ff7555758..ca83e5e2f6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: f5bb6f2fd1296e593be74bedf21cc3eed9adc2e3 .
+# From configure.in Id: d491e70670048cb080e0e996d172cd27960e4328 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -17393,8 +17393,8 @@ done
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gnutls/gnutls.h>
-#if GNUTLS_VERSION_NUMBER < 0x030202
-#error "GnuTLS 3.2.2 or newer required"
+#if GNUTLS_VERSION_NUMBER < 0x030306
+#error "GnuTLS is too old"
 #endif
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
@@ -17402,7 +17402,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "GnuTLS is too old
+as_fn_error $? "GnuTLS 3.3.6 or newer required
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
@@ -21546,6 +21546,10 @@ $as_echo "$ol_cv_h_errno_thread_specific" >&6; }
 fi
 
 if test $ol_link_threads = no ; then
+	if test $ol_enable_slapd != no; then
+		as_fn_error $? "slapd requires thread support" "$LINENO" 5
+	fi
+
 	if test $ol_with_threads = yes ; then
 		as_fn_error $? "no suitable thread support" "$LINENO" 5
 	fi