diff --git a/ChangeLog b/ChangeLog
index 2bf05de0b4..f370e99eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr  9 18:48:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (do_select): ubf_select() is not necessary. interrupt is
+	  checked in the loop.
+
 Mon Apr  9 18:27:26 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* thread.c (do_select): use ubf_select() as UBF on windows.
diff --git a/thread.c b/thread.c
index 8ad02ccdc9..68fcf06294 100644
--- a/thread.c
+++ b/thread.c
@@ -1720,7 +1720,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
 		    if (except) *except = orig_except;
 		    wait = &wait_100ms;
 		} while (__th->interrupt_flag == 0 && (timeout == 0 || subst(timeout, &wait_100ms)));
-	    }, ubf_select);
+	    }, 0);
 	} while (result == 0 && (timeout == 0 || subst(timeout, &wait_100ms)));
     }
 #else