diff --git a/security/psm/Makefile b/security/psm/Makefile
index 2109c2c1e00c..f21d5a1f00cf 100755
--- a/security/psm/Makefile
+++ b/security/psm/Makefile
@@ -82,7 +82,7 @@ endif
 ifeq ($(OS_ARCH), WINNT)
 	gmake import IMPORTS=nlslayer/m16
 else
-	gmake import IMPORTS=nlslayer/m16 RELEASE_TREE=/h/tortoise/export/share/builds/components
+	gmake import IMPORTS=nlslayer/PR3 RELEASE_TREE=/h/tortoise/export/share/builds/components
 endif
 	cd ui;gmake
 	gmake
diff --git a/security/psm/server/Makefile b/security/psm/server/Makefile
index 99c2f681d613..04705449565e 100644
--- a/security/psm/server/Makefile
+++ b/security/psm/server/Makefile
@@ -221,7 +221,7 @@ XPCOM_LIBS = \
 ifeq ($(OS_ARCH), SunOS)
 NSPR_LINK_LIBS = -L$(DIST)/lib -Bdynamic -lnspr4 -lplc4 -lplds4
 XPCOM_LINK_LIBS = -lxpcom
-XPCOM_LIBS += $(DIST)/lib/libzlib.$(DLL_SUFFIX)
+XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
 else
 NSPR_LINK_LIBS = $(NSPR_LIBS)
 XPCOM_LINK_LIBS	= $(XPCOM_LIBS)