diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6d33fdda55f0..4c40b9358582 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-09  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	* configure.host: Restore match for darwin9 or later.
+	* configure.ac: Likewise.
+	* configure: Regenerate.
+
 2009-03-11  Andrew Haley  <aph@redhat.com>
 
 	* java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault): Clear
diff --git a/libjava/configure b/libjava/configure
index 5a7ed17943c1..5e6adf1d7ffc 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -27564,7 +27564,7 @@ case "${host}" in
  m68*-*-linux*)
     SIGNAL_HANDLER=include/dwarf2-signal.h
     ;;
- powerpc*-*-darwin* | i?86-*-darwin9* | x86_64-*-darwin9*)
+ powerpc*-*-darwin* | i?86-*-darwin[912]* | x86_64-*-darwin[912]*)
     SIGNAL_HANDLER=include/darwin-signal.h
     ;;
  powerpc*-*-aix*)
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 2a6b78276fa2..ae538fa866d4 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1642,7 +1642,7 @@ case "${host}" in
  m68*-*-linux*)
     SIGNAL_HANDLER=include/dwarf2-signal.h
     ;;
- powerpc*-*-darwin* | i?86-*-darwin9* | x86_64-*-darwin9*)
+ powerpc*-*-darwin* | i?86-*-darwin[[912]]* | x86_64-*-darwin[[912]]*)
     SIGNAL_HANDLER=include/darwin-signal.h
     ;;
  powerpc*-*-aix*)
diff --git a/libjava/configure.host b/libjava/configure.host
index 0e5631eaccd6..79ce4d68d954 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -295,11 +295,11 @@ EOF
 	slow_pthread_self=
 	can_unwind_signal=no
 	;;
-  i?86-*-darwin9*)
+  i?86-*-darwin[912]*)
 	can_unwind_signal=yes
 	DIVIDESPEC=-f%{m32:no-}%{!m32:%{!m64:no-}}%{m64:}use-divide-subroutine
         ;;
-  x86_64-*-darwin9*)
+  x86_64-*-darwin[912]*)
 	enable_hash_synchronization_default=yes
 	slow_pthread_self=
 	can_unwind_signal=yes