diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3b05c688e41f..1aa526359744 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-06  Noa Resare  <noa@resare.com>
+
+	* java/net/Socket.java (getPort): Return 0 instead of -1 on
+	unconnected sockets.
+
 2004-11-06  Michael Koch  <konqueror@gmx.de>
 
 	* java/lang/StringBuffer.java,
diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java
index bebd73d54796..8d35fe35acbc 100644
--- a/libjava/java/net/Socket.java
+++ b/libjava/java/net/Socket.java
@@ -520,14 +520,14 @@ public class Socket
 
   /**
    * Returns the port number of the remote end of the socket connection.  If
-   * this socket is not connected, then -1 is returned.
+   * this socket is not connected, then 0 is returned.
    *
    * @return The remote port this socket is connected to
    */
   public int getPort()
   {
     if (! isConnected())
-      return -1;
+      return 0;
 
     try
       {