diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 64ce665ef4dcda33a8fa5f36f751ec918b0c20a1..3cc61abe4cd68823785be189daaf6ac5aeeb9f56 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Andrew Haley  <aph@redhat.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (ecjx_LDFLAGS): Pass -fbootclasspath.
+
 2007-01-17  Keith Seitz  <keiths@redhat.com>
 
 	* java/lang/natThread.cc (finish_): Add JVMTI ThreadEnd notification.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index d95dc344638924c7891b43db0d8fe599f6c042eb..d28f6fa784984b6e9a2300ff1e76dd8d951c9a2b 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -673,7 +673,7 @@ if ENABLE_SHARED
 ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
 else !ENABLE_SHARED
 ## Use ecj.jar at compile time.
-ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
 endif !ENABLE_SHARED
 
 ecjx_LDADD = -L$(here)/.libs libgcj.la
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index e9323b7576fb8b399b9c9a49bf3e10e757e818b8..5ca8be56d18e7a29ebad21ad0222ebf9e0a30f52 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7793,7 +7793,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
 
 @NATIVE_FALSE@ecjx_LINK = $(GCJ_FOR_ECJX_LINK)
 @NATIVE_TRUE@ecjx_LINK = $(GCJLINK)
-@ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+@ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
 @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
 @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
 @NATIVE_FALSE@ecjx_LDADD =