diff --git a/configure.in b/configure.in
index 368fe67d61..6bd5dcdedd 100644
--- a/configure.in
+++ b/configure.in
@@ -1747,6 +1747,11 @@ fi
 if test $ol_link_threads != no ; then
 	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1,
 		[define to 1 if library is thread safe])
+
+	dnl This could be enabled without threads if all of the
+	dnl reentrant functions are available. Needs testing.
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT,1,
+		[define to 1 if library is reentrant])
 fi
 
 dnl ----------------------------------------------------------------
diff --git a/include/ldap.h b/include/ldap.h
index 6708506477..62f8cbcee6 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -54,9 +54,10 @@ LDAP_BEGIN_DECL
 /* OpenLDAP API Features */
 #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION
 
-#if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT ) || \
-	defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT )
 #	define	LDAP_API_FEATURE_THREAD_SAFE 		1
+#endif
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
 #	define  LDAP_API_FEATURE_SESSION_THREAD_SAFE	1
 #	define  LDAP_API_FEATURE_OPERATION_THREAD_SAFE	1
 #endif
diff --git a/include/ldap_features.hin b/include/ldap_features.hin
index d8bb4c7575..181a26d0e7 100644
--- a/include/ldap_features.hin
+++ b/include/ldap_features.hin
@@ -43,6 +43,9 @@
 **
 */
 
+/* is -lldap reentrant or not */
+#undef LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+
 /* is -lldap thread safe or not */
 #undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE