diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e14c6e9789f..099d7279533 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-02  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* libjava/java/net/ServerSocket.java (ServerSocket): Bind to any
+	interface if bindAddr is null.
+
 1999-11-30  Tom Tromey  <tromey@cygnus.com>
 
 	* posix-threads.cc (_Jv_MutexInit): Use _Jv_PthreadGetMutex to get
diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index 95c9f358c1c..82416435731 100644
--- a/libjava/java/net/ServerSocket.java
+++ b/libjava/java/net/ServerSocket.java
@@ -52,7 +52,7 @@ public class ServerSocket
     if (s != null)
       s.checkListen(port);
     impl.create(true);
-    impl.bind(bindAddr, port);
+    impl.bind(bindAddr == null ? ANY_IF : bindAddr, port);
     impl.listen(backlog);
   }