diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 160dce07231..cf605f62aa3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-09  Michael Koch  <konqueror@gmx.de>
+
+	PR libgcj/17069
+	* java/net/InetAddress.java (getLocalHost):
+	Throw UnknownHostException if local hostname cannot be determined.
+
 2005-01-06  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/ClassLoader.java (findClass): Fixed documentation.
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 33068031884..cfcf22b4268 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -714,7 +714,7 @@ public class InetAddress implements Serializable
 	  }
       }
     
-    if (hostname != null)
+    if (hostname != null && hostname.length() != 0)
       {
 	try
 	  {
@@ -725,6 +725,8 @@ public class InetAddress implements Serializable
 	  {
 	  }
       }
+    else
+      throw new UnknownHostException();
     
     if (localhost == null)
       localhost = new InetAddress (loopbackAddress, "localhost");