diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dce88d57aa01..8b56d0d1eb6e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-21  Sandro Tolaini  <tolaini@libero.it>
+
+	* configure.ac: Don't use darwin-signal.h as signal handler for
+	Darwin/i386.
+	* configure.host: Enable Darwin/i386 as a supported host, with no
+	signal unwinding.
+
 2006-09-20  Keith Seitz  <keiths@redhat.com>
 
 	* jvmti.cc (_Jv_JVMTI_CreateRawMonitor): Use _Jv_MallocUnchked
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 9ac1ce0840b7..6645723796fe 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1448,7 +1448,7 @@ case "${host}" in
  mips*-*-linux*)
     SIGNAL_HANDLER=include/mips-signal.h
     ;;
- *-*-darwin*)
+ powerpc*-*-darwin*)
     SIGNAL_HANDLER=include/darwin-signal.h
     ;;
  *)
diff --git a/libjava/configure.host b/libjava/configure.host
index 018d6172d415..e19a61a147e3 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -265,6 +265,11 @@ EOF
 	slow_pthread_self=
 	can_unwind_signal=yes
 	;;
+  i?86-*-darwin*)
+	enable_hash_synchronization_default=yes
+	slow_pthread_self=
+	can_unwind_signal=no
+	;;
   *-*-freebsd*)
 	slow_pthread_self=
 	;;