diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ef301dc8cc6ab2090a5eb494176b320405884616..d5ebd57b4e5aaf8df610f755f2f78017512c2c50 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-26  Ranjit Mathew  <rmathew@hotmail.com>
 
+	* configure.host: Use -fcheck-references and 
+	-fuse-divide-subroutine for MinGW until we fix
+	win32_exception_handler( ) in win32.cc w.r.t. Win32 
+	Structured Exception Handling (SEH).
+
 	* win32.cc (_Jv_platform_initProperties): Use generic names
 	like "x86" for the "os.arch" property to be consistent with
 	what Sun's JDK produces. Use the wProcessorArchitecture
diff --git a/libjava/configure.host b/libjava/configure.host
index 1e2183184e4e3fd1d0a4e2613c2f4cdb67dfdd56..91b529b2cd0f246bb30db8f667dc46c108e9893d 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -222,6 +222,13 @@ EOF
   *-*-freebsd*)
 	slow_pthread_self=
 	;;
+  *-mingw*)
+  	# FIXME: win32_exception_handler( ) in win32.cc does not do the
+	# right stuff yet w.r.t. SEH. Live with the following for now.
+	can_unwind_signal=no
+	CHECKREFSPEC=-fcheck-references
+	DIVIDESPEC=-fuse-divide-subroutine
+	;;
   *-cygwin*)
   	# The cygwin linker doesn't do 8-byte alignment by default, so
 	# disable hash synchronization for now.