diff --git a/CHANGES b/CHANGES
index 2ae65bacbd72d57c7160c920948974175255b3e0..86efecc86798c3b8b73da7b3032cb12bd6244c0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 OpenLDAP 2.1 Change Log
 
-OpenLDAP 2.1.7 Engineering
+OpenLDAP 2.1.7 Release
 	Fixed liblber bvarray_add bug (ITS#2142)
 	Added libldap additional schema routines
 	Updated ldapmodify -c error handling (ITS#2133)
diff --git a/build/version.sh b/build/version.sh
index 617c73a97c4c18b372ff781ec86a195c0a152e56..d20d6422bfc69711997521fb67f653ae500f1548 100755
--- a/build/version.sh
+++ b/build/version.sh
@@ -7,9 +7,9 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=1
-ol_patch=X
-ol_api_inc=20106
-ol_api_lib=2:106:0
+ol_patch=7
+ol_api_inc=20107
+ol_api_lib=2:107:0
 
 if test $ol_patch != X ; then
 	ol_version=${ol_major}.${ol_minor}.${ol_patch}
diff --git a/configure b/configure
index e85a3052dddf5d2d1743d2b0b951ace766239378..a1aa9b95a0ba23b336b308d81514c477b601364c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.408.2.17 2002/10/10 23:44:41 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.408.2.18 2002/10/17 15:09:47 kurt Exp  
 
 # Copyright 1998-2002 The OpenLDAP Foundation.  All Rights Reserved.
 # 
@@ -22429,6 +22429,9 @@ EOF
 fi
 
 if test "$ol_enable_shell" != no ; then
+	if( "$ol_link_thread" != no ; then
+		echo "configure: warning: Use of --without-threads is recommended with back-shell" 1>&2
+	fi
 	cat >> confdefs.h <<\EOF
 #define SLAPD_SHELL 1
 EOF
diff --git a/configure.in b/configure.in
index 67649cbc129a3e365a425fe4ff21c35dbaa2a780..a0da9385b2ac212265461cba88aae5f18b46493d 100644
--- a/configure.in
+++ b/configure.in
@@ -2661,6 +2661,9 @@ if test "$ol_link_perl" != no ; then
 fi
 
 if test "$ol_enable_shell" != no ; then
+	if( "$ol_link_thread" != no ; then
+		AC_MSG_WARN([Use of --without-threads is recommended with back-shell])
+	fi
 	AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
 	BUILD_SLAPD=yes
 	BUILD_SHELL=yes