--- resolv/netdb.h.orig	2014-06-03 22:58:26.000000000 -0400
+++ resolv/netdb.h	2014-06-03 23:00:06.000000000 -0400
@@ -653,6 +653,7 @@
 #  define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
 					     STD3 rules.  */
 # endif
+# define NI_NUMERICSCOPE	256	/* Don't convert scope_id to name.  */
 
 /* Translate name of a service location and/or a service name to set of
    socket addresses.
--- inet/getnameinfo.c.orig	2014-02-07 04:04:38.000000000 -0500
+++ inet/getnameinfo.c	2014-06-20 18:49:54.000000000 -0400
@@ -331,7 +331,8 @@
 			if (IN6_IS_ADDR_LINKLOCAL (&sin6p->sin6_addr)
 			    || IN6_IS_ADDR_MC_LINKLOCAL (&sin6p->sin6_addr))
 			  {
-			    if (if_indextoname (scopeid, scopeptr) == NULL)
+			    if ((flags & NI_NUMERICSCOPE) ||
+				if_indextoname (scopeid, scopeptr) == NULL)
 			      ++ni_numericscope;
 			    else
 			      scopelen = strlen (scopebuf);