diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 1bb05c18b..335612d80 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-05  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/iphlpapi.h (GAA_FLAG_*): Define.
+	(GetAdaptersAddresses): Add function declaration.
+	* lib/iphlpapi.def (GetAdaptersAddresses): Add function stub.
+	Thanks to:    ross <rossboulet at users dot sf dot net>
+
 2006-04-05  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/iptypes.h (IP_INTERFACE_NAME_INFO,
diff --git a/winsup/w32api/include/iphlpapi.h b/winsup/w32api/include/iphlpapi.h
index 214c53ef7..cddf4fd8a 100644
--- a/winsup/w32api/include/iphlpapi.h
+++ b/winsup/w32api/include/iphlpapi.h
@@ -10,6 +10,16 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#if (_WIN32_WINNT >= 0x0501)
+#define GAA_FLAG_SKIP_UNICAST 0x00000001
+#define GAA_FLAG_SKIP_ANYCAST 0x00000002
+#define GAA_FLAG_SKIP_MULTICAST 0x00000004
+#define GAA_FLAG_SKIP_DNS_SERVER 0x00000008
+#define GAA_FLAG_INCLUDE_PREFIX 0x00000010
+#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020
+#endif
+
 DWORD WINAPI AddIPAddress(IPAddr,IPMask,DWORD,PULONG,PULONG);
 DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW);
 DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW);
@@ -20,6 +30,9 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW);
 DWORD WINAPI DeleteProxyArpEntry(DWORD,DWORD,DWORD);
 DWORD WINAPI EnableRouter(HANDLE*,OVERLAPPED*);
 DWORD WINAPI FlushIpNetTable(DWORD);
+#if (_WIN32_WINNT >= 0x0501)
+ULONG WINAPI GetAdaptersAddresses(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG);
+#endif
 DWORD WINAPI GetAdapterIndex(LPWSTR,PULONG);
 DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO,PULONG);
 DWORD WINAPI GetBestInterface(IPAddr,PDWORD);
@@ -54,6 +67,7 @@ DWORD WINAPI SetIpStatistics(PMIB_IPSTATS);
 DWORD WINAPI SetIpTTL(UINT);
 DWORD WINAPI SetTcpEntry(PMIB_TCPROW);
 DWORD WINAPI UnenableRouter(OVERLAPPED*, LPDWORD);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/w32api/lib/iphlpapi.def b/winsup/w32api/lib/iphlpapi.def
index 2440ceadc..6fccc64b3 100644
--- a/winsup/w32api/lib/iphlpapi.def
+++ b/winsup/w32api/lib/iphlpapi.def
@@ -10,6 +10,7 @@ DeleteIpNetEntry@4
 DeleteProxyArpEntry@12
 EnableRouter@8
 FlushIpNetTable@4
+GetAdaptersAddresses@20
 GetAdapterIndex@8
 GetAdaptersInfo@8
 GetBestInterface@8