diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bccfee384..d590993b3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/netdb.h: Add AI_xxx flags available since Vista.
+
 2007-01-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc (if_nametoindex): Free IP_ADAPTER_ADDRESSES memory.
diff --git a/winsup/cygwin/include/netdb.h b/winsup/cygwin/include/netdb.h
index 74c205990..c9b46d3e7 100644
--- a/winsup/cygwin/include/netdb.h
+++ b/winsup/cygwin/include/netdb.h
@@ -147,16 +147,10 @@ extern __declspec(dllimport) int h_errno;
 #define AI_PASSIVE      1
 #define AI_CANONNAME    2
 #define AI_NUMERICHOST  4
-/*
- * These are not available in the WinSock implementation.  It wouldn't make
- * sense to support them in the ipv4 only case, so we drop them entirely.
- * We can define them if we run into problems but they are non-functional, so...
- */
-#if 0
-#define AI_V4MAPPED     16
-#define AI_ALL          32
-#define AI_ADDRCONFIG   64
-#endif
+/* Only available since Vista. Ignored on older systems. */
+#define AI_ALL          256
+#define AI_ADDRCONFIG   1024
+#define AI_V4MAPPED     2048
 
 #define NI_NOFQDN       1
 #define NI_NUMERICHOST  2