diff --git a/ChangeLog b/ChangeLog
index 45b4ef056..6093a91f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-10 Stefan Jones <stefan.jones@multigig.com>
+
+	* src/tclspice.c:
+	Do not join worker thread when using TCL_Threads as it causes
+	lockups on W32
+
 2004-06-04 Stefan Jones <stefan.jones@multigig.com>
 
 	* src/tclspice.c:
diff --git a/src/tclspice.c b/src/tclspice.c
index 478034da1..47a8e3c45 100755
--- a/src/tclspice.c
+++ b/src/tclspice.c
@@ -485,8 +485,6 @@ static int _thread_stop(){
     }
 #ifdef HAVE_LIBPTHREAD
     pthread_join(tid, NULL);
-#else
-    Tcl_JoinThread(tid,NULL);
 #endif
     fl_running = FALSE;
     ft_intrpt = FALSE;
@@ -536,7 +534,7 @@ static int _run(int argc,char **argv){
     pthread_create(&tid,NULL,_thread_run,(void *)string);
 #else
     Tcl_CreateThread(&tid,(Tcl_ThreadCreateProc *)_thread_run,string,
-        TCL_THREAD_STACK_DEFAULT,TCL_THREAD_JOINABLE);
+        TCL_THREAD_STACK_DEFAULT,TCL_THREAD_NOFLAGS);
 #endif
   } else 
     /* halt (pause) a bg run */