diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index c3b7c83c293..64360348f0e 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -84,14 +84,6 @@ SHLIB_LDSTARTFILE	=
 SHLIB_LDENDFILE		= 
 endif
 
-# HCT Include from Mozilla client build. 
-INCLUDES           = -I$(CORE_DEPTH)/../dist/include  -I$(CORE_DEPTH)/../include
-
-# This is where Mozilla Client build DIST & INCLUDE.
-# while DIST is where Security build put it LIB & INCLUDE
-MOZ_DIST           =  $(CORE_DEPTH)/../dist
-MOZ_LIB            =  $(CORE_DEPTH)/../dist/lib
-
 OS_CFLAGS          = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zmtd -Zomf -Zmt  -DDEBUG -DDEBUG_wintrinh -DTRACING -g
 
 # Where the libraries are
diff --git a/security/nss/lib/ckfw/builtins/Makefile b/security/nss/lib/ckfw/builtins/Makefile
index 8a2d0f9eb94..b9f7ef90e2f 100644
--- a/security/nss/lib/ckfw/builtins/Makefile
+++ b/security/nss/lib/ckfw/builtins/Makefile
@@ -30,7 +30,7 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.3 $ $Date: 2000-09-09 03:41:11 $ $Name:  $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.4 $ $Date: 2000-10-03 00:58:17 $ $Name:  $"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
@@ -54,11 +54,19 @@ else
 #
 ifneq ($(OS_ARCH), OSF1)
 
+ifeq ($(OS_ARCH), OS2)
+PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
+PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
+else
+PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX)
+PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX)
+endif
+
 EXTRA_LIBS += \
-        $(DIST)/lib/libnssckfw.a \
-        $(DIST)/lib/libnssb.a \
-	$(DIST)/lib/libplc4.a \
-	$(DIST)/lib/libplds4.a \
+        $(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \
+        $(DIST)/lib/libnssb.$(LIB_SUFFIX) \
+	$(PLC_STATIC_LIB) \
+	$(PLDS_STATIC_LIB) \
 	$(NULL)
 
 endif
diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
index a71a7dbf12d..6ef869bc43b 100644
--- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
+++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
@@ -78,8 +78,16 @@ ifdef MOZILLA_SECURITY_BUILD
 CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
 endif
 ifdef MOZILLA_BSAFE_BUILD
-CRYPTO_LIB += $(DIST)/lib/libbsafe.a
-CRYPTO_LIB += $(DIST)/lib/libfreebl.a 
+CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
+CRYPTO_LIB += $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
+endif
+
+ifeq ($(OS_ARCH), OS2)
+PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
+PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
+else
+PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX)
+PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX)
 endif
 
 EXTRA_LIBS += \
@@ -87,8 +95,8 @@ EXTRA_LIBS += \
 	$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/libplc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/libplds4.$(LIB_SUFFIX) \
+	$(PLC_STATIC_LIB) \
+	$(PLDS_STATIC_LIB) \
 	$(NULL)
 
 endif