diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fcd667f114b..bf0a93aa2f8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Sven de Marothy  <sven@physto.se>
+
+	* java/net/InetAddress.java
+	(toString): Don't print empty hostnames.
+
 2005-04-26  Luca Barbieri  <luca.barbieri@gmail.com>
 
 	PR libgcj/21136:
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 9de34c1266c..cfb7a5fb0d3 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -495,7 +495,7 @@ public class InetAddress implements Serializable
   public String toString()
   {
     String addr = getHostAddress();
-    String host = (hostName != null) ? hostName : addr;
+    String host = (hostName != null) ? hostName : "";
     return host + "/" + addr;
   }