diff --git a/mozilla/directory/Makefile b/mozilla/directory/Makefile
index 6a30970df1e..06ebf6f3e1b 100644
--- a/mozilla/directory/Makefile
+++ b/mozilla/directory/Makefile
@@ -68,13 +68,6 @@ libs install::	FORCE
 	fi
 
 clean clobber::	FORCE
-	@if [ -d $(NSPR_TREE)/ ]; then \
-		cd $(NSPR_TREE); \
-		$(MAKE) clean; \
-	else \
-		echo "No NSPR $(NSPR_VERSION) directory found"; \
-		exit 0; \
-	fi
 	@if [ -d $(LDAP_DEPTH)/c-sdk/ldap ]; then \
 		cd $(LDAP_DEPTH)/c-sdk/ldap; \
 		$(MAKE) -f Makefile.client $(MFLAGS) clean; \
@@ -82,6 +75,15 @@ clean clobber::	FORCE
 		echo "No LDAP directory -- skipping"; \
 		exit 0; \
 	fi
+
+veryclean:: FORCE
+	@if [ -d $(NSPR_TREE)/ ]; then \
+		cd $(NSPR_TREE); \
+		$(MAKE) clean; \
+	else \
+		echo "No NSPR $(NSPR_VERSION) directory found"; \
+		exit 0; \
+	fi
 	rm -rf ../dist 
 
 realclean clobber_all::	FORCE
diff --git a/mozilla/directory/c-sdk/build.mk b/mozilla/directory/c-sdk/build.mk
index 13cfe277430..c704eb7c13e 100644
--- a/mozilla/directory/c-sdk/build.mk
+++ b/mozilla/directory/c-sdk/build.mk
@@ -27,8 +27,13 @@ IUTIL_LIBNAME	= iutil$(IUTILVERS)
 SSLDAPVERS	= 50
 SSLDAPVERS_SUFFIX = 5.0
 SSLDAP_LIBNAME	= ssldap$(SSLDAPVERS)
-HYBRID_LIBNAME	= freebl_hybrid_$(SSLDAPVERS)
-PURE32_LIBNAME	= freebl_pure32_$(SSLDAPVERS)
+
+# nss library
+NSSVERS		= 3
+NSS_LIBNAME	= nss$(NSSVERS)
+SSL_LIBNAME	= ssl$(NSSVERS)
+HYBRID_LIBNAME	= freebl_hybrid_$(NSSVERS)
+PURE32_LIBNAME	= freebl_pure32_$(NSSVERS)
 
 ifneq ($(USE_64), 1)
 ifeq ($(OS_ARCH), SunOS)
diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
index 8f3771b894c..7118893ad2f 100644
--- a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
@@ -58,7 +58,7 @@ ifeq ($(OS_ARCH), SunOS)
 EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
 	     -l$(LDIF_LIBNAME) -l$(SSLDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
              -L$(NSCP_DISTDIR)/lib -l$(SVRCORE_LIBNAME) \
-	     -l$(SSL_LIBNAME) -l$(SSL_LIBNAME) \
+	     -l$(SSL_LIBNAME) -l$(NSS_LIBNAME) \
 	     -ldbm -lthread -lposix4 -lsocket -lnls \
 	     -ldl -lresolv -lgen 
 EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
@@ -75,14 +75,14 @@ libdir:
 	$(NSINSTALL) $(LIBLOCATION)/lib$(LDAP_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(LIBLOCATION)/lib$(PRLDAP_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(LIBLOCATION)/lib$(SSLDAP_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
-	$(NSINSTALL) $(NSCP_DISTDIR)/lib/$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
-	$(NSINSTALL) $(NSCP_DISTDIR)/lib/$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
-	$(NSINSTALL) $(NSCP_DISTDIR)/lib/$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(SSL_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(NSS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 ifeq ($(COPYFREEBL), 1)
-        $(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(HYBRID_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
-        $(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(HYBRID_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 endif
 
 $(LDAPTOOLCOMMON_OBJ):
diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/convutf8.cpp b/mozilla/directory/c-sdk/ldap/clients/tools/convutf8.cpp
index 9c578f0af95..6573133a81c 100644
--- a/mozilla/directory/c-sdk/ldap/clients/tools/convutf8.cpp
+++ b/mozilla/directory/c-sdk/ldap/clients/tools/convutf8.cpp
@@ -1,25 +1,57 @@
-/* 
+/*
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.mozilla.org/NPL/
- *  
+ *
  * Software distributed under the License is distributed on an "AS
  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
  * implied. See the License for the specific language governing
  * rights and limitations under the License.
- *  
+ *
  * The Original Code is Mozilla Communicator client code, released
  * March 31, 1998.
- * 
+ *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
  * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
- * 
- * Contributor(s): 
+ *
+ * Contributor(s):
  */
 
+#ifndef HAVE_LIBNLS
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern char	*ldaptool_charset;
+char		*ldaptool_convdir = NULL;
+static		int charsetset = 0;
+char		*ldaptool_local2UTF8( const char *src );
+
+char *
+ldaptool_local2UTF8( const char *src )
+{
+    char *utf8;
+
+    charsetset = 0;
+
+    if (src == NULL)
+    {
+	return NULL;
+    }
+    utf8 = strdup(src);
+
+    return ( utf8 );
+}
+
+#else /* HAVE_LIBNLS */
+
 #include <stdio.h>
 #include <string.h>
 #ifdef XP_WIN32
@@ -556,3 +588,9 @@ ldaptool_local2UTF8( const char *src )
  
     return utf8;
 }
+#endif /* HAVE_LIBNLS */
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
index 165aca7013e..5dd02b02a2a 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
@@ -1,11 +1,12 @@
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-LDAPSRC		= ../..
 MOD_DEPTH       = ../../../../../nsprpub
-NSPR_TREE	= ../../../../../nsprpub
+NSPR_TREE       = ../../../../../nsprpub
+LDAP_SRC        = ../..
+NSCP_DISTDIR    = ../../../../../dist
 
-RM		= rm -f
-SED		= sed
+include         $(NSPR_TREE)/config/rules.mk
+include         ../../../build.mk
 
 SRCS		= abandon.c \
 		  add.c \
@@ -62,40 +63,18 @@ SRCS		= abandon.c \
 
 REALOBJS	= $(SRCS:.c=.o)
 
-#OBJS		= $(REALOBJS) versiont.o
-OBJS		= $(REALOBJS)
+LDAPOBJDEST	= $(OBJDIR_NAME)
+OBJS		= $(addprefix $(LDAPOBJDEST)/, $(REALOBJS))
 
-HDIR		= $(LDAPSRC)/include
+HDIR		= $(LDAP_SRC)/include
 
-CFLAGS		= $(INCLUDES) $(DEFINES)
-
-LIBRARY_NAME	= ldap41
-
-#
-# DEFS are included in CFLAGS
-#
-DEFS		= $(PLATFORMCFLAGS) $(LDAP_DEBUG) $(KERBEROS) $(AFSKERBEROS) \
-		  $(UOFM) $(UOFA) $(NO_USERINTERFACE) $(CLDAP) $(NO_CACHE) \
-		  $(LDAP_REFERRALS) $(LDAP_DNS) $(STR_TRANSLATION) \
-		  $(LIBLDAP_CHARSETS) $(LIBLDAP_DEF_CHARSET) \
-		  $(SLAPD_BACKENDS) $(LDBMBACKEND) $(LDBMINCLUDE) $(PHONETIC) \
-		  $(LDAP_SSLIO_HOOKS)
-
-include $(NSPR_TREE)/config/rules.mk
+LIBLDAP		= $(addprefix $(LDAPOBJDEST)/, lib$(LDAP_LIBNAME).$(DLL_SUFFIX))
+INSTALLDIR	= $(DEPTH)/dist/$(OBJDIR_NAME)
 
 LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
-INCLUDES	+= -I$(HDIR) $(KRBINCLUDEFLAG)
-DEFINES		+= $(DEFS) -DFILTERFILE=./ldapfilter.conf \
-		   -DTEMPLATEFILE=./ldaptemplates.conf \
-		   -DNDEBUG -UMOZILLA_CLIENT
-
-# So we actually get the definition of hostent_data....
-ifeq ($(OS_ARCH),AIX)
-DEFINES               += -D_THREAD_SAFE
-endif
-
-GARBAGE		+= $(ETCDIR)/ldapfriendly $(ETCDIR)/ldapfilter.conf \
-		   $(ETCDIR)/ldaptemplates.conf $(ETCDIR)/ldapsearchprefs.conf
+INCLUDES	+= -I$(HDIR) -I$(INSTALLDIR)/include \
+		   -I../../../../../dist/include
+DEFINES		+= $(DEFS)
 
 PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
 PLATFORMLIBS	=
@@ -108,8 +87,6 @@ ETCFILES	= ldapfilter.conf \
 		  ldaptemplates.conf \
 		  $(NULL)
 
-#ETCDIR		= $(DIST)/etc
-INSTALLDIR	= $(DEPTH)/dist/$(OBJDIR_NAME)
 ETCDIR		= $(INSTALLDIR)/etc
 
 #
@@ -120,33 +97,51 @@ ETCDIR		= $(INSTALLDIR)/etc
 RUNTIMEETCDIR	= $(ETCDIR)
 
 #
-# To build slapd (the stand-alone ldap daemon), uncomment the MAKESLAPD
-# line and select the SLAPD_BACKENDS you want to use. If you enable the
-# LDBM backend, also select one of the LDBM backends.
+# shared library symbol export definitions
 #
-MAKESLAPD	= yes
-SLAPD_BACKENDS	= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD
-LDBMBACKEND	= -DLDBM_USE_NDBM
-
-#
-# uncomment this line to enable debugging code (a good idea)
-#
-ifndef BUILD_OPT
-LDAP_DEBUG	= -DLDAP_DEBUG
+ifeq ($(OS_ARCH), WINNT)
+GENEXPORTS=cmd /c  $(PERL) $(LDAP_SRC)/build/genexports.pl
+else
+GENEXPORTS=$(PERL) $(LDAP_SRC)/build/genexports.pl
 endif
 
-#
-# uncomment this line to enable support for LDAP referrals in libldap
-#
-LDAP_REFERRALS		= -DLDAP_REFERRALS
 
-#
-# uncomment this line to enable support for SSL I/O in libldap
-#
-LDAP_SSLIO_HOOKS	= -DLDAP_SSLIO_HOOKS
+# variable definitions for exported symbols
+ifeq ($(OS_ARCH), WINNT)
+        LDAP_EXPORT_DEFS=../msdos/winsock/nsldap32.def
+else
+        LDAP_EXPORT_DEFS= $(LDAPOBJDEST)/libldap.exp
+endif
+
+LDAP_EXPORT_FLAGS=$(addprefix $(DLLEXPORTS_PREFIX), $(LDAP_EXPORT_DEFS))
+
+GENEXPARGS=$(BUILD_DEBUG) $(LDAPVERS_SUFFIX) $(LDAPVERS)
+
+ifeq ($(OS_ARCH), AIX)
+    EXTRA_LIBS += $(LIBNSPR)
+else
+ifneq ($(OS_ARCH), OSF1)
+ifeq ($(OS_ARCH), WINNT)
+    EXTRA_LIBS = $(LIBNSPR)
+else
+    EXTRA_LIBS = $(DYNAMICNSPR)
+endif
+endif
+endif
+
+ifeq ($(OS_ARCH), SunOS)
+EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
+EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
+endif
+
+OBJDEST = $(OBJDIR_NAME)
 
 ###########################################################################
 
+# recursive gmake rule to create exported symbols file
+$(LDAPOBJDEST)/libldap.exp:: ../libldap.ex
+	$(GENEXPORTS) $(OS_ARCH) Standard $< $(GENEXPARGS) > $@
+
 versiont.c:	Makefile.client Version.c
 	@$(RM) $@
 	@(u="$${USER-root}" v="$(shell cat ../../build/version)" d="$(shell pwd)" \
@@ -155,10 +150,29 @@ versiont.c:	Makefile.client Version.c
 	-e "s|%VERSION%|$${v}|" \
 	< Version.c > $@)
 
-install::	$(LIBRARY) $(SHARED_LIBRARY)
-	$(INSTALL) -m 444 $(LIBRARY) $(INSTALLDIR)/lib
-ifdef MKSHLIB
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(INSTALLDIR)/lib
+all::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLDAP)
+
+$(LIBDIR):
+	$(MKDIR) $(LIBDIR)
+
+$(LIBLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
+	@echo ======= making $(LIBLDAP)
+ifdef SO_FILES_TO_REMOVE
+	-$(RM) $(SO_FILES_TO_REMOVE)
 endif
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(ETCFILES) $(ETCDIR)
-	
+	$(LINK_DLL) $(DSO_LDOPTS) $(LDAP_EXPORT_FLAGS) $(EXTRA_LIBS)
+
+veryclean:: clean
+
+clean::
+	$(RM) $(OBJS) $(LIBLDAP)
+
+$(OBJDEST):
+	$(MKDIR) $(OBJDEST)
+
+install:: $(LIBLDAP)
+ifdef MKSHLIB
+	$(INSTALL) -m 555 $(LIBLDAP) $(INSTALLDIR)/lib
+endif
+	$(INSTALL) -m 555 $(ETCFILES) $(ETCDIR)
+