diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index cddb4c428..804653540 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,16 @@
+2007-01-06  Pierre A. Humblet  <Pierre.Humblet@ieee.org>
+
+	* windns.h (DNS_TYPE_RP, DNS_TYPE_AFSDB, DNS_TYPE_X25,
+	DNS_TYPE_ISDN, DNS_TYPE_RT, DNS_TYPE_NSAP, DNS_TYPE_NSAPPTR,
+	DNS_TYPE_SIG, DNS_TYPE_KEY, DNS_TYPE_PX, DNS_TYPE_GPOS,
+	DNS_TYPE_AAAA, DNS_TYPE_LOC, DNS_TYPE_NXT, DNS_TYPE_EID,
+	DNS_TYPE_NIMLOC, DNS_TYPE_SRV, DNS_TYPE_ATMA, DNS_TYPE_NAPTR,
+	DNS_TYPE_KX, DNS_TYPE_CERT, DNS_TYPE_A6, DNS_TYPE_DNAME,
+	DNS_TYPE_SINK, DNS_TYPE_OPT, DNS_TYPE_UINFO, DNS_TYPE_UID,
+	DNS_TYPE_GID, DNS_TYPE_UNSPEC, DNS_TYPE_ADDRS, DNS_TYPE_TKEY,
+	DNS_TYPE_TSIG, DNS_TYPE_IXFR, DNS_TYPE_AXFR, DNS_TYPE_MAILB,
+	DNS_TYPE_MAILA, DNS_TYPE_ALL, DNS_TYPE_ANY): Add enum values.
+
 2006-11-21  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* Makefile.in: Add aclocal.m4 to source release.
diff --git a/winsup/w32api/include/windns.h b/winsup/w32api/include/windns.h
index 69fea3bd4..0a7760d0c 100644
--- a/winsup/w32api/include/windns.h
+++ b/winsup/w32api/include/windns.h
@@ -51,7 +51,45 @@ enum {
 	DNS_TYPE_HINFO,
 	DNS_TYPE_MINFO,
 	DNS_TYPE_MX,
-	DNS_TYPE_TEXT
+	DNS_TYPE_TEXT,
+	DNS_TYPE_RP,
+	DNS_TYPE_AFSDB,
+	DNS_TYPE_X25,
+	DNS_TYPE_ISDN,
+	DNS_TYPE_RT,
+	DNS_TYPE_NSAP,
+	DNS_TYPE_NSAPPTR,
+	DNS_TYPE_SIG,
+	DNS_TYPE_KEY,
+	DNS_TYPE_PX,
+	DNS_TYPE_GPOS,
+	DNS_TYPE_AAAA,
+	DNS_TYPE_LOC,
+	DNS_TYPE_NXT,
+	DNS_TYPE_EID,
+	DNS_TYPE_NIMLOC,
+	DNS_TYPE_SRV,
+	DNS_TYPE_ATMA,
+	DNS_TYPE_NAPTR,
+	DNS_TYPE_KX,
+	DNS_TYPE_CERT,
+	DNS_TYPE_A6,
+	DNS_TYPE_DNAME,
+	DNS_TYPE_SINK,
+	DNS_TYPE_OPT,
+	DNS_TYPE_UINFO=100,
+	DNS_TYPE_UID,
+	DNS_TYPE_GID,
+	DNS_TYPE_UNSPEC,
+	DNS_TYPE_ADDRS=248,
+	DNS_TYPE_TKEY,
+	DNS_TYPE_TSIG,
+	DNS_TYPE_IXFR,
+	DNS_TYPE_AXFR,
+	DNS_TYPE_MAILB,
+	DNS_TYPE_MAILA,
+	DNS_TYPE_ALL,
+	DNS_TYPE_ANY=DNS_TYPE_ALL
 };
 typedef enum _DNS_CHARSET
 {