diff --git a/src/ChangeLog b/src/ChangeLog
index 14d91354..dfc743d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-09  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* mswindows.c (run_with_timeout): Made thread_hnd non-static.
+
 2006-02-05  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* retr.c (sleep_between_retrievals): Sleep at a minimum of 1/2 of
diff --git a/src/mswindows.c b/src/mswindows.c
index 986f1ba4..c54a5a4b 100644
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -523,7 +523,7 @@ thread_helper (void *arg)
 bool
 run_with_timeout (double seconds, void (*fun) (void *), void *arg)
 {
-  static HANDLE thread_hnd = NULL;
+  HANDLE thread_hnd;
   struct thread_data thread_arg;
   DWORD thread_id;
   bool rc;
@@ -537,9 +537,6 @@ run_with_timeout (double seconds, void (*fun) (void *), void *arg)
       return false;
     }
 
-  /* Should never happen, but test for recursivety anyway.  */
-  assert (thread_hnd == NULL);
-
   thread_arg.fun = fun;
   thread_arg.arg = arg;
   thread_arg.ws_error = WSAGetLastError ();