diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6e7863fed37d..ad2364093c58 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-09  Adam Megacz  <adam@xwt.org>
+
+        * win32.cc (_CRT_MT, __mingwthr_key_dtor) Added fake
+        definitions to simulate -mthreads.
+	
 2002-03-09  Adam Megacz  <adam@xwt.org>
 
         * win32.cc (_Jv_platform_gettimeofday) Cast 1000 to long long to
diff --git a/libjava/win32.cc b/libjava/win32.cc
index 22139c99f4a4..57c63789f366 100644
--- a/libjava/win32.cc
+++ b/libjava/win32.cc
@@ -48,3 +48,17 @@ _Jv_platform_gettimeofday ()
   return t.time * 1000LL + t.millitm;
 }
 
+// The following definitions "fake out" mingw to think that -mthreads
+// was enabled and that mingwthr.dll was linked. GCJ-compiled
+// applications don't need this helper library because we can safely
+// detect thread death (return from Thread.run()).
+
+int _CRT_MT = 1;
+
+extern "C" int
+__mingwthr_key_dtor (DWORD, void (*) (void *))
+{
+  // FIXME: for now we do nothing; this causes a memory leak of
+  //        approximately 24 bytes per thread created.
+  return 0;
+}