diff --git a/client.mak b/client.mak
index 4c0c5ee120e..a5e4f74dd67 100644
--- a/client.mak
+++ b/client.mak
@@ -113,11 +113,17 @@ pull_seamonkey:
 # nmake has to be hardcoded, or we have to depend on mozilla/config
 # being pulled already to figure out what $(NMAKE) should be.
 
-clobber_all:
+clobber_all: clobber_nspr clobber_seamonkey
+
+build_all: build_nspr build_seamonkey
+
+clobber_nspr:
+	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
+	nmake -f makefile.win clobber_all
+
+clobber_seamonkey:
 	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-!if exist(dist)
-	rd /s /q dist
-!endif
+	-rd /s /q dist
 	set DIST_DIRS=1
 	set LAYOUT_DIRS=1
 	set CLIENT_DIRS=1
@@ -130,13 +136,22 @@ depend:
 	set CLIENT_DIRS=1
 	nmake -f makefile.win depend 
 
-build_all:
-	@cd $(MOZ_SRC)\mozilla\.
+build_nspr:
+	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
+	nmake -f makefile.win export
+
+build_seamonkey:
+	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
 	set DIST_DIRS=1
 	set LAYOUT_DIRS=1
 	set CLIENT_DIRS=1
 	nmake -f makefile.win all
 
+build_client:
+	@cd $(MOZ_SRC)\mozilla\.
+	set CLIENT_DIRS=1
+	nmake -f makefile.win all
+
 build_layout:
 	@cd $(MOZ_SRC)\mozilla\.
 	set LAYOUT_DIRS=1
@@ -149,13 +164,16 @@ build_dist:
 
 clobber_dist:
 	@cd $(MOZ_SRC)\mozilla\.
-	rd /s /q dist
 	set DIST_DIRS=1
 	nmake -f makefile.win clobber_all
 
+clobber_client:
+	@cd $(MOZ_SRC)\mozilla\.
+	set CLIENT_DIRS=1
+	nmake -f makefile.win clobber_all
+
 clobber_layout:
 	@cd $(MOZ_SRC)\mozilla\.
-	rd /s /q dist
 	set LAYOUT_DIRS=1
 	nmake -f makefile.win clobber_all
 
diff --git a/makefile.win b/makefile.win
index 28676d8a52e..afff71bba71 100644
--- a/makefile.win
+++ b/makefile.win
@@ -42,7 +42,6 @@ DIRS = \
 !if defined(DIST_DIRS)
   config			\
   dbm				\
-  nsprpub			\
   include			\
   jpeg				\
   modules\libreg		\
@@ -96,6 +95,7 @@ DIRS = \
 
 
 !ifdef NECKO
+all::
 export::
         @echo NECKO is enabled
 !endif
@@ -108,8 +108,15 @@ export::
 include <$(DEPTH)\config\rules.mak>
 
 
+#//------------------------------------------------------------------------
+#//
+#// MOZILLA_OFFICIAL junk: rebase and splitsym for binary release
+#//
+#//------------------------------------------------------------------------
 #// should make sure we have rebase, and die if not
 
+!if defined(MOZILLA_OFFICIAL)
+
 !if [for %i in (. %PATH%) do $(QUIET)if exist %i\$(REBASE) echo %i\$(REBASE) > rebase.yes]
 !endif
 
@@ -118,6 +125,7 @@ REBASE=
 !if [del rebase.yes]                                                           
 !endif
 !endif
+!endif
 
 rebase:
 !if defined(MOZILLA_OFFICIAL)