diff --git a/mozilla/java/xpcom/connect/src/makefile.win b/mozilla/java/xpcom/connect/src/makefile.win
index 7e3931cafc3..0b9afe9c107 100644
--- a/mozilla/java/xpcom/connect/src/makefile.win
+++ b/mozilla/java/xpcom/connect/src/makefile.win
@@ -59,4 +59,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(LIB)
 	$(MAKE_INSTALL)  $(LIB) $(DIST)\lib
 clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
\ No newline at end of file
+	rm -f "$(DIST)\lib\$(LIBRARY_NAME).lib"
diff --git a/mozilla/java/xpcom/connect/xpcom/makefile.win b/mozilla/java/xpcom/connect/xpcom/makefile.win
index 45a7e7c02aa..79a1f813a34 100644
--- a/mozilla/java/xpcom/connect/xpcom/makefile.win
+++ b/mozilla/java/xpcom/connect/xpcom/makefile.win
@@ -44,4 +44,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL) 
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
\ No newline at end of file
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
diff --git a/mozilla/java/xpcom/env.bat b/mozilla/java/xpcom/env.bat
new file mode 100755
index 00000000000..a03170ef192
--- /dev/null
+++ b/mozilla/java/xpcom/env.bat
@@ -0,0 +1,8 @@
+rem * set JDKHOME to your jdk directory
+set JDKHOME=c:\java\jdk1.3
+
+rem * set DIST to your mozilla binaries
+set DIST=c:\ws\mozilla\mozilla\dist\win32_d.obj
+
+set PATH=%path%;%jdkhome%\jre\bin;%jdkhome%\jre\bin\classic;%dist%\bin\components
+set CLASSPATH=%claspath%;%dist%\..\classes;.
\ No newline at end of file
diff --git a/mozilla/java/xpcom/java/components/makefile.win b/mozilla/java/xpcom/java/components/makefile.win
index 2d6ef23073c..ba383b7dbfe 100644
--- a/mozilla/java/xpcom/java/components/makefile.win
+++ b/mozilla/java/xpcom/java/components/makefile.win
@@ -43,7 +43,7 @@ LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
 include <$(DEPTH)\config\rules.mak>
 
 COMPONENT=bcBlackConnectInit
-CLASSES=bcIBlackConnectInit.class
+CLASSES=bcIBlackConnectInit.class bcBlackConnectInit.class
 
 $(COMPONENT).jar.comp: manifest $(CLASSES)
 	$(JDKHOME)\bin\jar cvfm $(COMPONENT).jar.comp  manifest *.class
@@ -60,7 +60,7 @@ install-component: $(COMPONENT).jar.comp $(COMPONENT).jar.info $(DLL)
 clobber-java:
 	-del *.class *.jar.comp
 clobber:: clobber-java
-	rm $(DIST)\bin\components\$(DLLNAME).dll
-	rm $(DIST)\bin\components\$(COMPONENT).jar.*
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
+	rm -f "$(DIST)\bin\components\$(COMPONENT).jar.*"
 clobber_all:: clobber-java
 install:: install-component
diff --git a/mozilla/java/xpcom/java/loader/makefile.win b/mozilla/java/xpcom/java/loader/makefile.win
index b23a1e19ead..9a8aef203ad 100644
--- a/mozilla/java/xpcom/java/loader/makefile.win
+++ b/mozilla/java/xpcom/java/loader/makefile.win
@@ -45,4 +45,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL)	
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
\ No newline at end of file
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
diff --git a/mozilla/java/xpcom/java/src/makefile.win b/mozilla/java/xpcom/java/src/makefile.win
index d37ea944f37..0844597b3f2 100644
--- a/mozilla/java/xpcom/java/src/makefile.win
+++ b/mozilla/java/xpcom/java/src/makefile.win
@@ -52,4 +52,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL)
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
diff --git a/mozilla/java/xpcom/java/test/makefile.win b/mozilla/java/xpcom/java/test/makefile.win
index 6b916a56450..650d93edd28 100644
--- a/mozilla/java/xpcom/java/test/makefile.win
+++ b/mozilla/java/xpcom/java/test/makefile.win
@@ -57,7 +57,7 @@ install-component: bcJavaSample.jar.comp bcJavaSample.jar.info $(DLL)
 clobber-java:
 	-del *.class *.jar.comp
 clobber:: clobber-java
-	rm $(DIST)\bin\components\$(DLLNAME).dll
-	rm $(DIST)\bin\components\bcJavaSample.jar.*
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
+	rm -f "$(DIST)\bin\components\bcJavaSample.jar.*"
 clobber_all:: clobber-java
 install:: install-component
\ No newline at end of file
diff --git a/mozilla/java/xpcom/java/xpidl/makefile.win b/mozilla/java/xpcom/java/xpidl/makefile.win
index 82b3e0a3330..23b842dee0d 100644
--- a/mozilla/java/xpcom/java/xpidl/makefile.win
+++ b/mozilla/java/xpcom/java/xpidl/makefile.win
@@ -63,6 +63,6 @@ export:: $(PROGRAM)
 	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
 
 clobber::
-	rm -f $(DIST)\bin\xpidl.exe
+	rm -f "$(DIST)\bin\xpidl.exe"
 
 $(PROGRAM):: $(OBJS) $(MYLIBS)
diff --git a/mozilla/java/xpcom/xpcom/makefile.win b/mozilla/java/xpcom/xpcom/makefile.win
index 459d856a695..1cad9d25127 100644
--- a/mozilla/java/xpcom/xpcom/makefile.win
+++ b/mozilla/java/xpcom/xpcom/makefile.win
@@ -52,4 +52,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL)
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"