diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c39097bc503..e659b42757d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/Socket.java (getPort): Return 0 in error case.
+
 2004-11-17  Michael Koch  <konqueror@gmx.de>
 
 	*  java/nio/DirectByteBufferImpl.java
diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java
index 8d35fe35acb..5d322376918 100644
--- a/libjava/java/net/Socket.java
+++ b/libjava/java/net/Socket.java
@@ -538,7 +538,7 @@ public class Socket
 	// This cannot happen as we are connected.
       }
 
-    return -1;
+    return 0;
   }
 
   /**