diff --git a/ChangeLog b/ChangeLog
index ad3c6d2552..2c41b19f41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-23  Ulrich Drepper  <drepper@redhat.com>
 
+	* nss/nss_files/files-hosts.c: Correct problem with three or more
+	entries with the same name.
+
 	* nss/nss_files/files-hosts.c: Implement multi handling.
 	* resolv/Versions: Export _res_hconf for GLIBC_2.2 from libc.
 
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
index c96a39c38e..7f4e778c7e 100644
--- a/nss/nss_files/files-hosts.c
+++ b/nss/nss_files/files-hosts.c
@@ -232,6 +232,8 @@ _nss_files_get##name##_r (proto,					      \
 		  /* Compute the new buffer end.  */			      \
 		  bufferend = (char *) &new_h_aliases[naliases + 1];	      \
 		  assert (bufferend <= buffer + buflen);		      \
+									      \
+		  result = old_result;					      \
 		}							      \
 	    }								      \
 									      \