diff --git a/CHANGES b/CHANGES
index 8e337dcc19..a3c32a0be0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,10 +3,12 @@ OpenLDAP Change Log
 Changes included in OpenLDAP 1.2
 	CVS Tag: OPENLDAP_REL_ENG_1_2
 	Fixed slapd/ldbm/add cache set state deadlock bug
+	Fixed slapd/ldbm/add,modrdn,delete e_ndn handling
 	Update ldap_open(3) man page to note ldap_init() is preferred.
 	Build environment
 		Fixed mkdep to handle multiple dependent files on one line
 		Fixed openldap.m4 to "protect" shell variable
+		Fixed HAVE_PHREAD_FINAL typo
 
 Changes included in OpenLDAP 1.2
 	CVS Tag: OPENLDAP_REL_ENG_1_2_BETA
diff --git a/configure b/configure
index cd92d814bf..711604d7a1 100755
--- a/configure
+++ b/configure
@@ -5436,7 +5436,7 @@ if eval "test \"`echo '$''{'ol_cv_berkeley_db2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-	if test $ol_cv_lib_db2 = no -o $ol_cv_header_db2 = no ; then
+	if test "$ol_cv_lib_db2" = no -o "$ol_cv_header_db2" = no ; then
 		ol_cv_berkeley_db2=no
 	else
 		ol_cv_berkeley_db2=yes
@@ -5620,7 +5620,7 @@ else
 fi
 done
 
-if test $ol_cv_header_db2 = yes ; then
+if test "$ol_cv_header_db2" = yes ; then
 	
 	ol_cv_header_db=$ac_cv_header_db_185_h
 else
@@ -5635,7 +5635,7 @@ if eval "test \"`echo '$''{'ol_cv_berkeley_db'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-	if test $ol_cv_lib_db = no -o $ol_cv_header_db = no ; then
+	if test "$ol_cv_lib_db" = no -o "$ol_cv_header_db" = no ; then
 		ol_cv_berkeley_db=no
 	else
 		ol_cv_berkeley_db=yes