diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0d62f8f7e26..18cb980c0a7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-11  Micheal Koch  <konqueror@gmx.de>
+
+	* java/net/URLStreamHandler.java (toExternalForm): Print port only
+	if host is printed too and port was really given to URL.
 2003-11-10  Gary Benson  <gbenson@redhat.com>
 
 	* java/sql/Timestamp.java (valueOf): Correctly handle
diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index 9198370d7ad..a05e4740cd6 100644
--- a/libjava/java/net/URLStreamHandler.java
+++ b/libjava/java/net/URLStreamHandler.java
@@ -478,11 +478,13 @@ public abstract class URLStreamHandler
       }
 
     if (host.length() != 0)
-      sb.append("//").append(host);
+      {
+        sb.append("//").append(host);
 
-    // Append port if port was in URL spec.
-    if (port != -1)
-      sb.append(':').append(port);
+        // Append port if port was in URL spec.
+        if (port >= 0)
+          sb.append(':').append(port);
+      }
 
     sb.append(file);