--- a/client.mk
+++ b/client.mk
@@ -402,17 +402,17 @@ MODULES_all :=                          
 #######################################################################
 # Checkout Tags
 #
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
 #MOZ_CO_TAG          = <tag>
 NSPR_CO_TAG          = NSPRPUB_PRE_4_2_CLIENT_BRANCH
 NSS_CO_TAG           = NSS_3_11_5_RTM
-LDAPCSDK_CO_TAG      =
+LDAPCSDK_CO_TAG      = ldapcsdk_5_17_client_branch
 LOCALES_CO_TAG       =
 
 #######################################################################
 # Defines
 #
 CVS = cvs
 comma := ,
 

--- a/configure.in
+++ b/configure.in
@@ -7592,24 +7592,24 @@ dnl ====================================
 if test "$MOZ_DEBUG" || test "$NS_TRACE_MALLOC"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
 fi
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
     if test "$OS_ARCH" = "WINNT"; then
         if test -n "$GNU_CC"; then
-            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
+            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v50 -lnsldappr32v50'
         else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
+            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v50.${IMPORT_LIB_SUFFIX}'
         fi
     elif test "$VACPP"; then
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
+            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap50.${IMPORT_LIB_SUFFIX}'
     else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
+        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
     fi
 fi
 
 if test "$COMPILE_ENVIRONMENT"; then
 if test "$SUNCTL"; then
     dnl older versions of glib do not seem to have gmodule which ctl needs
     _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $GLIB_CFLAGS"

--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@@ -310,21 +310,20 @@ bin/components/xulappinfo.xpt
 ; spellchecker (may not be present)
 bin/components/myspell.dll
 bin/components/spellchk.dll
 bin/components/spellchecker.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
 bin/components/mozldap.dll
 bin/components/mozldap.xpt
-;bin/nsldap32v60.dll
-bin/ldap60.dll
-;bin/nsldappr32v60.dll
-bin/prldap60.dll
-bin/ldif60.dll
+;bin/nsldap32v50.dll
+bin/ldap50.dll
+;bin/nsldappr32v50.dll
+bin/prldap50.dll
 
 ; p3p
 bin/components/p3p.xpt
 bin/components/p3p.dll
 
 ; classic theme
 bin/chrome/classic.jar
 bin/chrome/classic.manifest

--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -308,19 +308,19 @@ bin/components/libauth.so
 ; GnomeVFS support
 bin/components/libnkgnomevfs.so
 
 ; webservices
 bin/components/libwebsrvcs.so
 bin/components/websrvcs.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
-bin/libldap60.so
-bin/libprldap60.so
-bin/libldif60.so
+bin/libldap50.so
+bin/libprldap50.so
+bin/liblber50.so
 bin/components/libmozldap.so
 bin/components/mozldap.xpt
 
 ; Roaming
 bin/components/libsroaming.so
 bin/chrome/sroaming.jar
 
 ; p3p

--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -188,19 +188,18 @@ bin\components\websrvcs.xpt
 ; spellchecker (may not be present)
 bin\components\myspell.dll
 bin\components\spellchk.dll
 bin\components\spellchecker.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
 bin\components\mozldap.dll
 bin\components\mozldap.xpt
-bin\nsldap32v60.dll
-bin\nsldappr32v60.dll
-bin\nsldif32v60.dll
+bin\nsldap32v50.dll
+bin\nsldappr32v50.dll
 
 ;PSM related files
 bin\components\pippki.dll
 bin\components\pippki.xpt
 bin\chrome\pipnss.jar
 bin\chrome\pippki.jar
 
 ; chrome stuff