diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8d5a914b92c..e64860dfc86 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-14  Mark Wielaard <mark@klomp.org>
+
+	* java/net/natPlainDatagramSocketImpl.cc (close): Set timeout to 0.
+	* java/net/natSocketImpl.cc (close): Likewise.
+
 2002-04-14  Mark Wielaard <mark@klomp.org>
 
 	* gnu/gcj/protocol/http/Connection.java (usingProxy): return false.
diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index e43102a1661..3c318d7667c 100644
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -309,6 +309,7 @@ java::net::PlainDatagramSocketImpl::close ()
   // the return value.
   ::close (fnum);
   fnum = -1;
+  timeout = 0;
 }
 
 void
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 2ea46e6163b..2c6a2415cfb 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -428,6 +428,7 @@ java::net::PlainSocketImpl::close()
     }
   // Safe place to reset the file pointer.
   fnum = -1;
+  timeout = 0;
 }
 
 // Write a byte to the socket.