diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5fcda75dd..47525aea8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-27  Corinna Vinschen  <corinna@vinschen.de>
+
+	* net.cc (inet_ntop6): Convert to lowercase hex digits on the fly.
+
 2009-03-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc (cygwin_getaddrinfo): Check hints for non-NULL before
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index d8294513e..4ea6ffedf 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -3083,7 +3083,12 @@ inet_ntop6 (const u_char *src, char *dst, size_t size)
 	  break;
 	}
       __small_sprintf(tp, "%x", words[i]);
-      tp += strlen(tp);
+      while (*tp)
+	{
+	  if (isupper (*tp))
+	    *tp = _tolower (*tp);
+	  ++tp;
+	}
     }
   /* Was it a trailing run of 0x00's? */
   if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))