diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3e9ec0b84a54f70ac6a9215707bfda8f09ffb735..3900527024b7bc00f8e13b1f4ac182f28ce994f7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-06  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* Makefile.am (libgcj_tools_la_GCJFLAGS): Add
+	-fno-indirect-classes.
+	* Makefile.in: Regenerate.
+	* gcj/Makefile.in: Regenerate.
+	* include/Makefile.in: Regenerate.
+	* testsuite/Makefile.in: Regenerate.
+
 2006-07-06  Bryce McKinlay <mckinlay@redhat.com>
 
 	* boehm.cc (_Jv_MarkObj): Mark the next_or_version field.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 95d4c50805846ca8691c908b1699159bb75b2901..d14ef07686fcbe7df8a5523643eaff470246d667 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -236,7 +236,7 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
 libgcj_la_LINK = $(LIBLINK)
 
 libgcj_tools_la_SOURCES = classpath/tools/tools.jar
-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 6337fedc67d5bd224ed4cf2bc44cbbda74158723..58cdae28986b9de0c2e645e5e6eeb2c2757d8ac3 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -560,6 +560,7 @@ THREADINCS = @THREADINCS@
 THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
 UNZIP = @UNZIP@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
@@ -783,7 +784,7 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
 
 libgcj_la_LINK = $(LIBLINK)
 libgcj_tools_la_SOURCES = classpath/tools/tools.jar
-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index a8aff8b8a39a263c44d0f6a5966c831fe1083dfd..91db9b0518c35eec22bcbb075289f701024e9383 100644
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -195,6 +195,7 @@ THREADINCS = @THREADINCS@
 THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
 UNZIP = @UNZIP@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index c19ad102f2a12bead54e1447b8c6829e446b3305..49c2387545512b225c807bae1dc29045dd4942aa 100644
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -194,6 +194,7 @@ THREADINCS = @THREADINCS@
 THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
 UNZIP = @UNZIP@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index d7e37b928e91cf6000aaa1eb4d0a6e15a19c5f25..a61199b9775224c32bdcd7c96d6cf71d24f3c8a2 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -183,6 +183,7 @@ THREADINCS = @THREADINCS@
 THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
 UNZIP = @UNZIP@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@