diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index abfc8a379..c8c821f23 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/ws2tcpip.h (gai_strerror): Remove thread-safety comment.
+	This function cannot be made thread-safe, the API would have to be
+	changed for that, just like strerror() -> strerror_r() and similar
+	ISO C or POSIX functions...
+
 2006-04-19  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/edevdefs.h: New file.
diff --git a/winsup/w32api/include/ws2tcpip.h b/winsup/w32api/include/ws2tcpip.h
index 3b68b3df1..6ae0ea50d 100644
--- a/winsup/w32api/include/ws2tcpip.h
+++ b/winsup/w32api/include/ws2tcpip.h
@@ -304,8 +304,6 @@ 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)
 {