diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 0e48c1a98..d08ffe5b7 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-10  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* mthr_stub.c (__mingwthr_key_dtor): Replace assert(0) with 
+	a diagnostic, guarded by #ifdef DEBUG.
+	(__mingwthr_remove_key_dtor): Likewise.
+
 2005-08-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* moldname.def.in (sleep, beep, seterrormode): Remove.
diff --git a/winsup/mingw/mthr_stub.c b/winsup/mingw/mthr_stub.c
index cb926c16c..e337b9a1c 100644
--- a/winsup/mingw/mthr_stub.c
+++ b/winsup/mingw/mthr_stub.c
@@ -15,31 +15,30 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
-#include <assert.h>
 
 /*
  * __mingwthr_register_key_dtor (DWORD key, void (*dtor) (void *))
  *
  * Public interface called by C++ exception handling mechanism in
  * libgcc (cf: __gthread_key_create).
- *
- * THIS SHOULD NEVER BE CALLED!
- *
+ * No-op versions.
  */
 
 int
 __mingwthr_key_dtor (DWORD key, void (*dtor) (void *))
 {
-  assert (0);
-  /* NOTREACHED */
+#ifdef DEBUG
+  printf ("%s: ignoring key: (%ld) / dtor: (%x)\n", 
+          __FUNCTION__, key, dtor);
+#endif
   return 0;
 }
 
-
 int
 __mingwthr_remove_key_dtor (DWORD key )
 {
-  assert (0);
-  /* NOTREACHED */
+#ifdef DEBUG
+  printf ("%s: ignoring key: (%ld)\n", __FUNCTION__, key );
+#endif
   return 0;
 }