diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6a73f1bf365..1a935bb8ff7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-14  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* java/net/natInetAddressPosix.cc (lookup): Reflect rename of 
+	localhostAddress to loopbackAddress.
+	* java/net/natInetAddressWin32.cc (lookup): Likewise.
+
 2004-08-13  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* configure.in (GCINCS): Don't use "boehm-cflags". Instead, -I 
diff --git a/libjava/java/net/natInetAddressPosix.cc b/libjava/java/net/natInetAddressPosix.cc
index 9edfae29010..d343f23323c 100644
--- a/libjava/java/net/natInetAddressPosix.cc
+++ b/libjava/java/net/natInetAddressPosix.cc
@@ -167,7 +167,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
 #else
       // FIXME: this is insufficient if some other piece of code calls
       // this gethostbyname.
-      JvSynchronize sync (java::net::InetAddress::localhostAddress);
+      JvSynchronize sync (java::net::InetAddress::loopbackAddress);
       hptr = gethostbyname (hostname);
 #endif /* HAVE_GETHOSTBYNAME_R */
     }
@@ -221,7 +221,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
 #else /* HAVE_GETHOSTBYADDR_R */
       // FIXME: this is insufficient if some other piece of code calls
       // this gethostbyaddr.
-      JvSynchronize sync (java::net::InetAddress::localhostAddress);
+      JvSynchronize sync (java::net::InetAddress::loopbackAddress);
       hptr = gethostbyaddr (val, len, type);
 #endif /* HAVE_GETHOSTBYADDR_R */
     }
diff --git a/libjava/java/net/natInetAddressWin32.cc b/libjava/java/net/natInetAddressWin32.cc
index 42c7d7db9e8..82c1e6f7002 100644
--- a/libjava/java/net/natInetAddressWin32.cc
+++ b/libjava/java/net/natInetAddressWin32.cc
@@ -60,7 +60,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
 
       // FIXME: this is insufficient if some other piece of code calls
       // this gethostbyname.
-      JvSynchronize sync (java::net::InetAddress::localhostAddress);
+      JvSynchronize sync (java::net::InetAddress::loopbackAddress);
       hptr = gethostbyname (hostname);
     }
   else
@@ -87,7 +87,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
 
       // FIXME: this is insufficient if some other piece of code calls
       // this gethostbyaddr.
-      JvSynchronize sync (java::net::InetAddress::localhostAddress);
+      JvSynchronize sync (java::net::InetAddress::loopbackAddress);
       hptr = gethostbyaddr (val, len, type);
     }
   if (hptr != NULL)