--- a/configure.in	2012-05-29 22:48:29.000000000 -0500
+++ a/configure.in	2012-05-29 22:49:10.000000000 -0500
@@ -6741,7 +6741,7 @@ 
     elif test "$OS_ARCH" = "OS2"; 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}'
     else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
+        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lmozldap60 -lmozprldap60 -lmozldif60'
     fi
 
     dnl export LDAP_LIBS so that confvars.sh can pick it up, so when we get to
--- a/ldap/sdks/c-sdk/build.mk	2012-04-28 14:40:26.000000000 -0500
+++ a/ldap/sdks/c-sdk/build.mk	2012-05-29 21:48:13.000000000 -0500
@@ -67,7 +67,7 @@ 
 ifeq ($(OS_ARCH), WINNT)
 LDAP_LIBNAME	= nsldap32v$(LDAPVERS)
 else
-LDAP_LIBNAME	= ldap$(LDAPVERS)
+LDAP_LIBNAME	= mozldap$(LDAPVERS)
 endif
 DIR_VERSION     = $(LDAPVERS_SUFFIX)
 DIRSDK_VERSION  = $(LDAPVERS_SUFFIX)
@@ -76,7 +76,7 @@ 
 ifeq ($(OS_ARCH), WINNT)
 PRLDAP_LIBNAME	= nsldappr32v$(PRLDAPVERS)
 else
-PRLDAP_LIBNAME	= prldap$(PRLDAPVERS)
+PRLDAP_LIBNAME	= mozprldap$(PRLDAPVERS)
 endif
 
 # lber library
@@ -90,7 +90,7 @@ 
 ifeq ($(OS_ARCH), WINNT)
 LDIF_LIBNAME	= nsldif32v$(LDIFVERS)
 else
-LDIF_LIBNAME	= ldif$(LDIFVERS)
+LDIF_LIBNAME	= mozldif$(LDIFVERS)
 endif
 
 # iutil library
--- a/mail/installer/package-manifest.in	2012-05-30 08:01:24.000000000 -0500
+++ a/mail/installer/package-manifest.in	2012-05-30 08:01:47.000000000 -0500
@@ -270,9 +270,9 @@ 
 @BINPATH@/nsldappr32v60@DLL_SUFFIX@
 @BINPATH@/nsldif32v60@DLL_SUFFIX@
 #else
-@BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@mozldap60@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@mozldif60@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@mozprldap60@DLL_SUFFIX@
 #endif
 
 ; login manager