diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ac42734710e1..1427245c11a1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-24  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* configure.ac (extra_ldflags_libjava): Enable -single_module only for
+	darwin < 8.
+	* configure: Regenerate.
+
 2005-08-23  Roman Kennke  <roman@kennke.org>
 
 	* java/lang/Character.java
diff --git a/libjava/configure b/libjava/configure
index fddaacb5bd1c..4ccabd75650e 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -8377,7 +8377,9 @@ libsubdir=.libs
 
 # extra LD Flags which are required for targets
 case "${host}" in
-  *-darwin*)
+*-*-darwin0-7.*)
+    # For now we have to disable it on darwin[8-9] because it slows down
+    # the linking phase. A possible bug in ld?
     # on Darwin -single_module speeds up loading of the dynamic libraries.
     extra_ldflags_libjava=-Wl,-single_module
     ;;
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 2b39801e6d87..8eec0cb0c98c 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -670,7 +670,9 @@ libsubdir=.libs
 
 # extra LD Flags which are required for targets
 case "${host}" in
-  *-darwin*)
+*-*-darwin[0-7].*)
+    # For now we have to disable it on darwin[8-9] because it slows down
+    # the linking phase. A possible bug in ld?
     # on Darwin -single_module speeds up loading of the dynamic libraries.
     extra_ldflags_libjava=-Wl,-single_module
     ;;