diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b89faeb6b2d..3153305bc1c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-03  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* gnu/java/nio/natSelectorImplPosix.cc
+	(implSelect): A timeout of 0 means an infinite
+	timeout.
+
 2003-12-02  Fernando Nasser  <fnasser@redhat.com>
  
 	* gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation
diff --git a/libjava/gnu/java/nio/natSelectorImplPosix.cc b/libjava/gnu/java/nio/natSelectorImplPosix.cc
index 8f1bb685ebf..81de3ed9475 100644
--- a/libjava/gnu/java/nio/natSelectorImplPosix.cc
+++ b/libjava/gnu/java/nio/natSelectorImplPosix.cc
@@ -57,8 +57,10 @@ gnu::java::nio::SelectorImpl::implSelect (jintArray read, jintArray write,
   real_time_data.tv_usec = timeout;
 
   // If not legal timeout value is given, use NULL.
-  // This means an infinite timeout.
-  if (timeout >= 0)
+  // This means an infinite timeout. The specification
+  // also says that a zero timeout should be treated
+  // as infinite.
+  if (timeout > 0)
     {
       time_data = &real_time_data;
     }