diff --git a/configure.in b/configure.in
index 7c2469aaf0..368fe67d61 100644
--- a/configure.in
+++ b/configure.in
@@ -1750,7 +1750,7 @@ if test $ol_link_threads != no ; then
 fi
 
 dnl ----------------------------------------------------------------
-dnl Tests for reentrant functions necessary to build -lldap_r
+dnl Tests for reentrant functions necessary for reentrant build
 AC_CHECK_FUNCS(		\
 	ctime_r			\
 	gmtime_r localtime_r \
diff --git a/include/ldap_features.hin b/include/ldap_features.hin
index 5f6c8016c7..d8bb4c7575 100644
--- a/include/ldap_features.hin
+++ b/include/ldap_features.hin
@@ -32,11 +32,8 @@
 ** OpenLDAP reentrancy/thread-safeness should be dynamically
 ** checked using ldap_get_option().
 **
-** The -lldap implementation is not thread-safe.
-**
-** The -lldap_r implementation is:
+** If built with thread support, the -lldap implementation is:
 **		LDAP_API_FEATURE_THREAD_SAFE (basic thread safety)
-** but also be:
 **		LDAP_API_FEATURE_SESSION_THREAD_SAFE
 **		LDAP_API_FEATURE_OPERATION_THREAD_SAFE
 **
@@ -46,7 +43,7 @@
 **
 */
 
-/* is -lldap_r available or not */
+/* is -lldap thread safe or not */
 #undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
 
 /* LDAP v2 Referrals */
diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index 16b6f49648..21b0ef85b7 100644
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -17,7 +17,7 @@
 
 LDAP_BEGIN_DECL
 
-/* Can be done twice in libldap_r.  See libldap_r/ldap_thr_debug.h. */
+/* Can be done twice.  See libldap/ldap_thr_debug.h. */
 LDAP_F(int) ldap_int_thread_initialize LDAP_P(( void ));
 LDAP_F(int) ldap_int_thread_destroy    LDAP_P(( void ));