diff --git a/mozilla/cck/customcd/makefile.win b/mozilla/cck/customcd/makefile.win
index 92f86b9546c..3c175383880 100644
--- a/mozilla/cck/customcd/makefile.win
+++ b/mozilla/cck/customcd/makefile.win
@@ -28,7 +28,7 @@ include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\cck\InitDist.win>
 
 export::
-	$(MAKE_INSTALL) *.exe $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell
-	$(MAKE_INSTALL) *.inf $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell
-	$(MAKE_INSTALL) *.ini $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell
-	$(MAKE_INSTALL) *.txt $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell
+	$(MAKE_INSTALL) *.exe $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell
+	$(MAKE_INSTALL) *.inf $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell
+	$(MAKE_INSTALL) *.ini $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell
+	$(MAKE_INSTALL) *.txt $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell
diff --git a/mozilla/cck/customcd/shell/bmps/makefile.win b/mozilla/cck/customcd/shell/bmps/makefile.win
index 4328764b933..64dd8335ee7 100644
--- a/mozilla/cck/customcd/shell/bmps/makefile.win
+++ b/mozilla/cck/customcd/shell/bmps/makefile.win
@@ -26,5 +26,5 @@ include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\cck\InitDist.win>
 
 export::
-	$(MAKE_INSTALL) *.bmp $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell\bmps
-	$(MAKE_INSTALL) *.ico $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell\bmps
+	$(MAKE_INSTALL) *.bmp $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell\bmps
+	$(MAKE_INSTALL) *.ico $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell\bmps
diff --git a/mozilla/cck/customcd/shell/makefile.win b/mozilla/cck/customcd/shell/makefile.win
index a65d0ed1789..033d7a2ebbd 100644
--- a/mozilla/cck/customcd/shell/makefile.win
+++ b/mozilla/cck/customcd/shell/makefile.win
@@ -28,4 +28,4 @@ include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\cck\InitDist.win>
 
 export::
-	$(MAKE_INSTALL) * $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell
+	$(MAKE_INSTALL) * $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell
diff --git a/mozilla/cck/customcd/shell/nsetup32/makefile.win b/mozilla/cck/customcd/shell/nsetup32/makefile.win
index 0ba418357e3..0118fedf913 100644
--- a/mozilla/cck/customcd/shell/nsetup32/makefile.win
+++ b/mozilla/cck/customcd/shell/nsetup32/makefile.win
@@ -26,5 +26,5 @@ include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\cck\InitDist.win>
 
 export::
-	$(MAKE_INSTALL) *.exe $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell\nsetup32
-	$(MAKE_INSTALL) *.ini $(CCKDIST)\CCKTool\WSTemplate\Autorun\Shell\nsetup32
+	$(MAKE_INSTALL) *.exe $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell\nsetup32
+	$(MAKE_INSTALL) *.ini $(CCKDIST)\CCKTool\WSTemplate\Workspace\Autorun\Shell\nsetup32