diff --git a/ChangeLog b/ChangeLog
index 7deb56f0e2..5b6bc1d277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* inet/getnameinfo.c (getnameinfo): Use correct destination
+	parameter for if_indextoname.
+	Patch by Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>.
+
 2000-11-09  H.J. Lu  <hjl@gnu.org>
 
 	* sunrpc/Versions (GLIBC_2.1): Remove xdr_cryptkeyarg,
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 119def2f83..25a8af7a6c 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -312,7 +312,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
 			if (IN6_IS_ADDR_LINKLOCAL (&sin6p->sin6_addr)
 			    || IN6_IS_ADDR_MC_LINKLOCAL (&sin6p->sin6_addr))
 			  {
-			    if (if_indextoname (scopeid, scopebuf) == NULL)
+			    if (if_indextoname (scopeid, scopeptr) == NULL)
 			      ++ni_numericscope;
 			    else
 			      scopelen = strlen (scopebuf);