diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 0ec57c4d620..20bda097993 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -264,6 +264,10 @@ ifdef MOZ_JSDEBUGGER
 tier_50_dirs += js/jsd
 endif
 
+ifdef MOZ_PSM
+tier_50_dirs	+= security/manager
+endif
+
 ifdef MOZ_ENABLE_LIBXUL
 tier_50_dirs += \
 		toolkit/library \
@@ -275,10 +279,6 @@ ifdef NS_TRACE_MALLOC
 tier_50_dirs += tools/trace-malloc
 endif
 
-ifdef MOZ_PSM
-tier_50_dirs	+= security/manager
-endif
-
 ifdef MOZ_STORAGE
 tier_50_dirs += storage
 endif
diff --git a/mozilla/security/manager/boot/src/Makefile.in b/mozilla/security/manager/boot/src/Makefile.in
index 83117902afe..d7f39fc0f60 100644
--- a/mozilla/security/manager/boot/src/Makefile.in
+++ b/mozilla/security/manager/boot/src/Makefile.in
@@ -51,7 +51,7 @@ MODULE_NAME	= BOOT
 EXPORT_LIBRARY	= 1
 META_COMPONENT	= crypto
 GRE_MODULE	= 1
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = pipboot.pkg
 
diff --git a/mozilla/security/manager/pki/src/Makefile.in b/mozilla/security/manager/pki/src/Makefile.in
index cff3bda33ba..8623bdb4832 100644
--- a/mozilla/security/manager/pki/src/Makefile.in
+++ b/mozilla/security/manager/pki/src/Makefile.in
@@ -52,7 +52,7 @@ MODULE_NAME	= PKI
 EXPORT_LIBRARY	= 1
 META_COMPONENT	= crypto
 GRE_MODULE	= 1
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = pippki.pkg
 
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index 95e4d205cff..e6bf25f7885 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -52,7 +52,7 @@ MODULE_NAME	= NSS
 EXPORT_LIBRARY	= 1
 META_COMPONENT	= crypto
 GRE_MODULE	= 1
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = pipnss.pkg
 
diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in
index e4b9368918c..9c3db7d0842 100644
--- a/mozilla/toolkit/library/Makefile.in
+++ b/mozilla/toolkit/library/Makefile.in
@@ -133,6 +133,9 @@ COMPONENT_LIBS += \
 	toolkitcomps \
 	xpinstall \
 	jsd \
+	pippki \
+	pipboot \
+	pipnss \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
@@ -256,6 +259,7 @@ EXTRA_DSO_LDOPTS += \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
 	$(MOZ_JS_LIBS) \
+	$(NSS_LIBS) \
 	$(NULL)
 
 ifdef MOZ_NATIVE_ZLIB
diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp
index 1c3207d46d7..502348985df 100644
--- a/mozilla/toolkit/library/nsStaticXULComponents.cpp
+++ b/mozilla/toolkit/library/nsStaticXULComponents.cpp
@@ -192,6 +192,9 @@
     XREMOTE_MODULES                          \
     MODULE(nsSoftwareUpdate)                 \
     MODULE(JavaScript_Debugger)              \
+    MODULE(PKI)                              \
+    MODULE(BOOT)                             \
+    MODULE(NSS)                              \
     /* end of list */
 
 #define MODULE(_name) \
diff --git a/mozilla/xpcom/stub/Makefile.in b/mozilla/xpcom/stub/Makefile.in
index 5509e7a29f4..fd5d6baa4b3 100644
--- a/mozilla/xpcom/stub/Makefile.in
+++ b/mozilla/xpcom/stub/Makefile.in
@@ -88,6 +88,13 @@ DEPENDENT_LIBS_LIST += \
 
 ifdef MOZ_ENABLE_LIBXUL
 
+DEPENDENT_LIBS_LIST += \
+	$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
+	$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
+	$(LIB_PREFIX)ssl3$(DLL_SUFFIX) \
+	$(LIB_PREFIX)smime3$(DLL_SUFFIX) \
+	$(NULL)
+
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 DEPENDENT_LIBS_LIST += js$(MOZ_BITS)$(VERSION_NUMBER)$(DLL_SUFFIX)
 else