diff --git a/client.mak b/client.mak
index 0e5171a158d..e8b9c75f77b 100644
--- a/client.mak
+++ b/client.mak
@@ -182,6 +182,7 @@ pull_nss:
 
 pull_psm: pull_nss
 	cd $(MOZ_SRC)\.
+	$(CVSCO_PSM) mozilla/security/manager
 	$(CVSCO_PSM) mozilla/security/psm
 	$(CVSCO_PSM) mozilla/security/makefile.win
 
@@ -288,7 +289,7 @@ build_nspr:
 
 build_psm:
 	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win export
+	nmake -f makefile.win 
 
 build_xpconnect: build_nspr
 	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
diff --git a/makefile.win b/makefile.win
index 88d3f7a14d0..078f98da25f 100644
--- a/makefile.win
+++ b/makefile.win
@@ -58,7 +58,7 @@ DIRS =                         \
   modules\mpfilelocprovider    \
   modules\zlib                 \
   netwerk                      \
-!if defined(BUILD_PSM)
+!if defined(BUILD_PSM) || defined(BUILD_PSM2)
   security                     \
 !endif
   widget\timer                 \
diff --git a/security/makefile.win b/security/makefile.win
index 0ed4471117e..a65fb7b0206 100644
--- a/security/makefile.win
+++ b/security/makefile.win
@@ -22,6 +22,13 @@
 DEPTH=..
 include <$(DEPTH)/config/config.mak>
 
-DIRS = nss psm\lib\nlslayer psm
+DIRS = nss 
+!if defined(BUILD_PSM2)
+	manager \
+!else
+	psm\lib\nlslayer \
+	psm \
+!endif
+	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>