diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 25c690b05..2a479ae24 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-24  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* lib/ws2_32.def: Regenerate using gendef on a Win7 machine.
+
 2010-08-24  Ozkan Sezer  <sezero@users.sourceforge.net>
 
 	* winnt.h: Fix several SUBLANG ID errors (ref:
diff --git a/winsup/w32api/lib/ws2_32.def b/winsup/w32api/lib/ws2_32.def
index 05160bda4..19f3f69db 100644
--- a/winsup/w32api/lib/ws2_32.def
+++ b/winsup/w32api/lib/ws2_32.def
@@ -1,104 +1,22 @@
-LIBRARY WS2_32.DLL
+;
+; Definition file of WS2_32.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "WS2_32.dll"
 EXPORTS
-WEP@0
-WPUCompleteOverlappedRequest@20
-WSAAccept@20
-WSAAddressToStringA@20
-WSAAddressToStringW@20
-WSAAsyncGetHostByAddr@28
-WSAAsyncGetHostByName@20
-WSAAsyncGetProtoByName@20
-WSAAsyncGetProtoByNumber@20
-WSAAsyncGetServByName@24
-WSAAsyncGetServByPort@24
-WSAAsyncSelect@16
-WSACancelAsyncRequest@4
-WSACancelBlockingCall@0
-WSACleanup@0
-WSACloseEvent@4
-WSAConnect@28
-WSACreateEvent@0
-WSADuplicateSocketA@12
-WSADuplicateSocketW@12
-WSAEnumNameSpaceProvidersA@8
-WSAEnumNameSpaceProvidersW@8
-WSAEnumNetworkEvents@12
-WSAEnumProtocolsA@12
-WSAEnumProtocolsW@12
-WSAEventSelect@12
-WSAGetLastError@0
-WSAGetOverlappedResult@20
-WSAGetQOSByName@12
-WSAGetServiceClassInfoA@16
-WSAGetServiceClassInfoW@16
-WSAGetServiceClassNameByClassIdA@12
-WSAGetServiceClassNameByClassIdW@12
-WSAHtonl@12
-WSAHtons@12
-WSAInstallServiceClassA@4
-WSAInstallServiceClassW@4
-WSAIoctl@36
-WSAIsBlocking@0
-WSAJoinLeaf@32
-WSALookupServiceBeginA@12
-WSALookupServiceBeginW@12
-WSALookupServiceEnd@4
-WSALookupServiceNextA@16
-WSALookupServiceNextW@16
-WSANtohl@12
-WSANtohs@12
-WSANSPIoctl@32
-WSAProviderConfigChange@12
-WSARecv@28
-WSARecvDisconnect@8
-WSARecvFrom@36
-WSARemoveServiceClass@4
-WSAResetEvent@4
-WSASend@28
-WSASendDisconnect@8
-WSASendTo@36
-WSASetBlockingHook@4
-WSASetEvent@4
-WSASetLastError@4
-WSASetServiceA@12
-WSASetServiceW@12
-WSASocketA@24
-WSASocketW@24
-WSAStartup@8
-WSAStringToAddressA@20
-WSAStringToAddressW@20
-WSAUnhookBlockingHook@0
-WSAWaitForMultipleEvents@20
-WSCDeinstallProvider@8
-WSCEnableNSProvider@8
-WSCEnumProtocols@16
-WSCGetProviderPath@16
-WSCInstallNameSpace@20
-WSCInstallProvider@20
-WSCUnInstallNameSpace@4
-__WSAFDIsSet@8
 accept@12
 bind@12
 closesocket@4
 connect@12
-freeaddrinfo@4
-getaddrinfo@16
-gethostbyaddr@12
-gethostbyname@4
-gethostname@8
-getnameinfo@28
 getpeername@12
-getprotobyname@4
-getprotobynumber@4
-getservbyname@8
-getservbyport@8
 getsockname@12
 getsockopt@20
 htonl@4
 htons@4
+ioctlsocket@12
 inet_addr@4
 inet_ntoa@4
-ioctlsocket@12
 listen@8
 ntohl@4
 ntohs@4
@@ -110,3 +28,147 @@ sendto@24
 setsockopt@20
 shutdown@8
 socket@12
+WSApSetPostRoutine@4
+FreeAddrInfoEx@4
+FreeAddrInfoExW@4
+FreeAddrInfoW@4
+GetAddrInfoExA@40
+GetAddrInfoExW@40
+GetAddrInfoW@16
+GetNameInfoW@28
+InetNtopW@16
+InetPtonW@12
+SetAddrInfoExA@48
+SetAddrInfoExW@48
+WPUCompleteOverlappedRequest@20
+WSAAccept@20
+WSAAddressToStringA@20
+WSAAddressToStringW@20
+WSAAdvertiseProvider@8
+WSACloseEvent@4
+WSAConnect@28
+WSAConnectByList@32
+WSAConnectByNameA@36
+WSAConnectByNameW@36
+WSACreateEvent@0
+WSADuplicateSocketA@12
+WSADuplicateSocketW@12
+WSAEnumNameSpaceProvidersA@8
+WSAEnumNameSpaceProvidersExA@8
+gethostbyaddr@12
+gethostbyname@4
+getprotobyname@4
+getprotobynumber@4
+getservbyname@8
+getservbyport@8
+gethostname@8
+WSAEnumNameSpaceProvidersExW@8
+WSAEnumNameSpaceProvidersW@8
+WSAEnumNetworkEvents@12
+WSAEnumProtocolsA@12
+WSAEnumProtocolsW@12
+WSAEventSelect@12
+WSAGetOverlappedResult@20
+WSAGetQOSByName@12
+WSAGetServiceClassInfoA@16
+WSAGetServiceClassInfoW@16
+WSAGetServiceClassNameByClassIdA@12
+WSAGetServiceClassNameByClassIdW@12
+WSAHtonl@12
+WSAHtons@12
+WSAInstallServiceClassA@4
+WSAInstallServiceClassW@4
+WSAIoctl@36
+WSAJoinLeaf@32
+WSALookupServiceBeginA@12
+WSALookupServiceBeginW@12
+WSALookupServiceEnd@4
+WSALookupServiceNextA@16
+WSALookupServiceNextW@16
+WSANSPIoctl@32
+WSANtohl@12
+WSANtohs@12
+WSAPoll@12
+WSAProviderCompleteAsyncCall@8
+WSAProviderConfigChange@12
+WSARecv@28
+WSARecvDisconnect@8
+WSARecvFrom@36
+WSARemoveServiceClass@4
+WSAResetEvent@4
+WSASend@28
+WSASendDisconnect@8
+WSASendMsg@24
+WSASendTo@36
+WSASetEvent@4
+WSASetServiceA@12
+WSASetServiceW@12
+WSASocketA@24
+WSASocketW@24
+WSAAsyncSelect@16
+WSAAsyncGetHostByAddr@28
+WSAAsyncGetHostByName@20
+WSAAsyncGetProtoByNumber@20
+WSAAsyncGetProtoByName@20
+WSAAsyncGetServByPort@24
+WSAAsyncGetServByName@24
+WSACancelAsyncRequest@4
+WSASetBlockingHook@4
+WSAUnhookBlockingHook@0
+WSAGetLastError@0
+WSASetLastError@4
+WSACancelBlockingCall@0
+WSAIsBlocking@0
+WSAStartup@8
+WSACleanup@0
+WSAStringToAddressA@20
+WSAStringToAddressW@20
+WSAUnadvertiseProvider@4
+WSAWaitForMultipleEvents@20
+WSCDeinstallProvider@8
+WSCEnableNSProvider@8
+WSCEnumProtocols@16
+WSCGetApplicationCategory@24
+WSCGetProviderInfo@24
+WSCGetProviderPath@16
+WSCInstallNameSpace@20
+WSCInstallNameSpaceEx@24
+WSCInstallProvider@20
+WSCInstallProviderAndChains@32
+WSCSetApplicationCategory@28
+WSCSetProviderInfo@24
+WSCUnInstallNameSpace@4
+WSCUpdateProvider@20
+WSCWriteNameSpaceOrder@8
+WSCWriteProviderOrder@8
+WahCloseApcHelper@4
+WahCloseHandleHelper@4
+WahCloseNotificationHandleHelper@4
+WahCloseSocketHandle@8
+WahCloseThread@8
+WahCompleteRequest@20
+WahCreateHandleContextTable@4
+WahCreateNotificationHandle@8
+WahCreateSocketHandle@8
+WahDestroyHandleContextTable@4
+WahDisableNonIFSHandleSupport@0
+WahEnableNonIFSHandleSupport@0
+WahEnumerateHandleContexts@12
+WahInsertHandleContext@8
+__WSAFDIsSet@8
+WahNotifyAllProcesses@4
+WahOpenApcHelper@4
+WahOpenCurrentThread@8
+WahOpenHandleHelper@4
+WahOpenNotificationHandleHelper@4
+WahQueueUserApc@16
+WahReferenceContextByHandle@8
+WahRemoveHandleContext@8
+WahWaitForNotification@16
+WahWriteLSPEvent@8
+freeaddrinfo@4
+getaddrinfo@16
+getnameinfo@28
+inet_ntop@16
+inet_pton@12
+WEP@0