diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4ff0d1c2e..8fe599eaa 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-16  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/ws2tcpip.h (gai_strerror): Add thread-safety comment.
+
 2006-04-14  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/ws2tcpip.h (gai_strerror{AW}): Implement as inline function.
diff --git a/winsup/w32api/include/ws2tcpip.h b/winsup/w32api/include/ws2tcpip.h
index 6ae0ea50d..3b68b3df1 100644
--- a/winsup/w32api/include/ws2tcpip.h
+++ b/winsup/w32api/include/ws2tcpip.h
@@ -304,6 +304,8 @@ int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
 /* FIXME: Need WS protocol-independent API helpers.  */
 #endif
 
+/* One might well ask if gai_strerror has been ripped from MS Platform SDK
+   headers.  It is obviously not thread-safe.  */
 static __inline char*
 gai_strerrorA(int ecode)
 {