diff --git a/mozilla/client.mak b/mozilla/client.mak
index 1ac1f31b616..28bb93ccce9 100644
--- a/mozilla/client.mak
+++ b/mozilla/client.mak
@@ -41,9 +41,9 @@ MOZ_OBJDIR = WIN32_O.OBJ
 #//------------------------------------------------------------------------
 # uncomment these, modify branch tag, and check in to branch for milestones
 MOZ_BRANCH=PHT_2002_08_08_BRANCH
-NSPR_CO_TAG=PHT_2002_08_08_BRANCH
+NSPR_CO_TAG=NSPR_4_2_2_RC1
 PSM_CO_TAG=PHT_2002_08_08_BRANCH
-NSS_CO_TAG=NSS_MULTIACCESS_DB_TAG
+NSS_CO_TAG=NSS_3_6_BETA1
 LDAPCSDK_CO_TAG=PHT_2002_08_08_BRANCH
 ACCESSIBLE_CO_TAG=PHT_2002_08_08_BRANCH
 IMGLIB2_CO_TAG=PHT_2002_08_08_BRANCH
@@ -99,8 +99,11 @@ CVSCO = cvs $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(CVS_BRANCH)
 NSPR_CO_FLAGS=$(MOZ_CO_FLAGS)
 !endif
 
-NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) $(CVS_BRANCH)
-
+!if "$(NSPR_CO_TAG)" != ""
+NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
+!else
+NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r NSPRPUB_PRE_4_2_CLIENT_BRANCH
+!endif
 
 CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)
 
diff --git a/mozilla/client.mk b/mozilla/client.mk
index 28dcf0919ab..564da174dd3 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -53,9 +53,9 @@
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
 MOZ_CO_TAG = PHT_2002_08_08_BRANCH
-NSPR_CO_TAG = PHT_2002_08_08_BRANCH
+NSPR_CO_TAG = NSPR_4_2_2_RC1
 PSM_CO_TAG = PHT_2002_08_08_BRANCH
-NSS_CO_TAG = NSS_MULTIACCESS_DB_TAG
+NSS_CO_TAG = NSS_3_6_BETA1
 LDAPCSDK_CO_TAG = PHT_2002_08_08_BRANCH
 ACCESSIBLE_CO_TAG = PHT_2002_08_08_BRANCH
 GFX2_CO_TAG = PHT_2002_08_08_BRANCH
diff --git a/mozilla/security/manager/boot/src/Makefile.in b/mozilla/security/manager/boot/src/Makefile.in
index 6acabd2892f..d84e2c6308e 100644
--- a/mozilla/security/manager/boot/src/Makefile.in
+++ b/mozilla/security/manager/boot/src/Makefile.in
@@ -80,7 +80,7 @@ REQUIRES	= nspr \
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
-		-I$(DIST)/public/security \
+		-I$(DIST)/public/nss \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
diff --git a/mozilla/security/manager/pki/src/Makefile.in b/mozilla/security/manager/pki/src/Makefile.in
index 939d2102183..32a24db2745 100644
--- a/mozilla/security/manager/pki/src/Makefile.in
+++ b/mozilla/security/manager/pki/src/Makefile.in
@@ -72,7 +72,7 @@ REQUIRES	= nspr \
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
-		-I$(DIST)/public/security \
+		-I$(DIST)/public/nss \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index b7a82cea376..9ce42618c58 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -105,8 +105,8 @@ include $(topsrcdir)/config/rules.mk
 
 # Use local includes because they are inserted before INCLUDES
 # so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += -I$(DIST)/public/security \
-                  -I$(DIST)/private/security \
+LOCAL_INCLUDES += -I$(DIST)/public/nss \
+                  -I$(DIST)/private/nss \
                   $(NULL)
 
 EXTRA_DSO_LDOPTS += \
diff --git a/mozilla/security/manager/ssl/src/makefile.win b/mozilla/security/manager/ssl/src/makefile.win
index 915b0761100..0d4b1fb1909 100644
--- a/mozilla/security/manager/ssl/src/makefile.win
+++ b/mozilla/security/manager/ssl/src/makefile.win
@@ -80,8 +80,8 @@ CFLAGS = $(CFLAGS) -DNSS_USE_STATIC_LIBS
 !endif
 
 LINCS = $(LINCS)     \
-    -I$(XPDIST)/public/security \
-    -I$(XPDIST)/private/security \
+    -I$(XPDIST)/public/nss \
+    -I$(XPDIST)/private/nss \
     $(NULL)