diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index df7a417fa7c2..c99540070d13 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -8,6 +8,9 @@
 	* Makefile.in: Rebuilt.
 	* libtool-version: Increment .so version number.
 
+	* Makefile.am: Escape quotes in echo.
+	* Makefile.in: Rebuilt.
+
 2002-03-16  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	* Makefile.am: Use empty -classpath flag in addition to -bootclasspath.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 5c5dbdeceb5c..1f1b9f4897cb 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -187,7 +187,7 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
 	@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
 	javac="$(JAVAC)"; \
 	cat tmp-list | (while read f; do \
-	  echo $$javac $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $$f; \
+	  echo $$javac $(JCFLAGS) -classpath \'\' -bootclasspath $(here):$(srcdir) -d $(here) $$f; \
 	  $$javac $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $$f \
 	    || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
 	done; \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 9c59392b03ee..3d67cf93fb1b 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -3218,7 +3218,7 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
 	@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
 	javac="$(JAVAC)"; \
 	cat tmp-list | (while read f; do \
-	  echo $$javac $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $$f; \
+	  echo $$javac $(JCFLAGS) -classpath \'\' -bootclasspath $(here):$(srcdir) -d $(here) $$f; \
 	  $$javac $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $$f \
 	    || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
 	done; \