diff --git a/mozilla/extensions/java/xpcom/interfaces/Makefile.in b/mozilla/extensions/java/xpcom/interfaces/Makefile.in
index bd8a7d3eef1..f5e010b3c01 100644
--- a/mozilla/extensions/java/xpcom/interfaces/Makefile.in
+++ b/mozilla/extensions/java/xpcom/interfaces/Makefile.in
@@ -63,7 +63,7 @@ GEN_JAVA_SRCS = \
 # install jars into SDK
 SDK_LIBRARY = $(JARFILE) $(JARFILE_SRC)
 
-GARBAGE += $(JARFILE) $(JARFILE_SRC) $(GEN_JAVA_SRCS)
+GARBAGE += $(JARFILE) $(JARFILE_SRC) $(GEN_JAVA_SRCS) java.files
 GARBAGE_DIRS += _javagen org
 
 include $(topsrcdir)/config/rules.mk
@@ -89,12 +89,12 @@ _javagen/org/mozilla/xpcom/.iface_done: $(JAVA_SRCS) $(DIST)/bin/GenerateJavaInt
 	$(RUN) $(DIST)/bin/GenerateJavaInterfaces$(BIN_SUFFIX) -d $(OUTPUT_DIR)
 	@touch $@
 
-# Use find and xargs for passing list of Java files to JAVAC.  This avoids the
-# "argument list too long" error on Windows when using *.java
+# Using the temporary "java.files" avoids an "argument list too long"
+# error on Windows when using *.java
 org/mozilla/xpcom/.class_done: _javagen/org/mozilla/xpcom/.iface_done
 	@echo Compiling Java interface classes
-	find _javagen -name "*.java" | xargs $(JAVAC) $(JAVAC_FLAGS) -classpath . \
-      -d . -sourcepath _javagen
+	find _javagen -name "*.java" > java.files
+	$(JAVAC) $(JAVAC_FLAGS) -classpath . -d . -sourcepath _javagen @java.files
 	@touch $@
 
 $(JARFILE): org/mozilla/xpcom/.class_done Makefile
diff --git a/mozilla/extensions/java/xpcom/src/Makefile.in b/mozilla/extensions/java/xpcom/src/Makefile.in
index bae7e095d3e..758bcdf9853 100755
--- a/mozilla/extensions/java/xpcom/src/Makefile.in
+++ b/mozilla/extensions/java/xpcom/src/Makefile.in
@@ -86,7 +86,7 @@ endif
 # necessary until we do 'cvs move' to put files in correct directories
 LOCAL_INCLUDES += -I$(srcdir)
 
-GARBAGE += $(JARFILE) $(JARFILE_SRC)
+GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files
 GARBAGE_DIRS += _javagen org
 
 include $(topsrcdir)/config/rules.mk
@@ -109,13 +109,14 @@ _javagen/org/mozilla/xpcom/internal/.iface_done: $(JAVA_SRCS)
 			_javagen/org/mozilla/xpcom/internal
 	@touch $@
 
-# Use find and xargs for passing list of Java files to JAVAC.  This avoids the
-# "argument list too long" error on Windows when using *.java
+# Using the temporary "java.files" avoids an "argument list too long"
+# error on Windows when using *.java
 org/mozilla/xpcom/internal/.class_done: _javagen/org/mozilla/xpcom/internal/.iface_done
 	@echo Compiling Java implementation classes
-	find _javagen -name "*.java" | xargs $(JAVAC) $(JAVAC_FLAGS) \
-			-classpath ".$(SEP)../interfaces/MozillaInterfaces.jar" \
-      -d . -sourcepath _javagen
+	find _javagen -name "*.java" > java.files
+	$(JAVAC) $(JAVAC_FLAGS) \
+	  -classpath ".$(SEP)../interfaces/MozillaInterfaces.jar" \
+	  -d . -sourcepath _javagen @java.files
 	@touch $@
 
 $(JARFILE): org/mozilla/xpcom/internal/.class_done Makefile