diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 39f8318d875..e42d79acaf8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-01  Stephen Crawley <crawley@dstc.edu.au>
+
+	* java/net/SocketImpl.java (toString): Display the remote address
+	of an unconnected server socket as "0.0.0.0/0.0.0.0".
+
 2003-08-01  Sascha Brawer  <brawer@dandelis.ch>
 
 	* javax/swing/border/BevelBorder.java,
diff --git a/libjava/java/net/SocketImpl.java b/libjava/java/net/SocketImpl.java
index 14101513e09..e43b49ed599 100644
--- a/libjava/java/net/SocketImpl.java
+++ b/libjava/java/net/SocketImpl.java
@@ -276,7 +276,8 @@ public abstract class SocketImpl implements SocketOptions
    */
   public String toString()
   {
-    return "[addr=" + address
+    return "[addr=" + ((address == null) ? "0.0.0.0/0.0.0.0" :
+ 		       address.toString())
 	    + ",port=" + port
 	    + ",localport=" + localport + "]";
   }