diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 521c7e42d..4703373c7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-12  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* include/cygwin/in.h (struct in6_addr): Fix spelling.
+	* include/cygwin/socket.h (AF_INET6, PF_INET6): Define macros.
+	(AF_MAX, PF_MAX): Bump to 32 to leave room for future expansion.
+
 Fri May 12 21:35:54 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* dcrt0.cc (build_argv): Remove unneeded variable.
diff --git a/winsup/cygwin/include/cygwin/in.h b/winsup/cygwin/include/cygwin/in.h
index d9ab331b3..a427e11ea 100644
--- a/winsup/cygwin/include/cygwin/in.h
+++ b/winsup/cygwin/include/cygwin/in.h
@@ -172,7 +172,7 @@ struct sockaddr_in {
  *	a beginning dont get excited 8)
  */
  
-struct in_addr6
+struct in6_addr
 {
 	unsigned char s6_addr[16];
 };
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index fad1efdf0..f40b2ac04 100644
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -66,8 +66,9 @@ struct msghdr
 #define AF_HYLINK       15              /* NSC Hyperchannel */
 #define AF_APPLETALK    16              /* AppleTalk */
 #define AF_NETBIOS      17              /* NetBios-style addresses */
+#define AF_INET6        18              /* IP version 6 */
 
-#define AF_MAX          18
+#define AF_MAX          32
 /*
  * Protocol families, same as address families for now.
  */
@@ -91,6 +92,7 @@ struct msghdr
 #define PF_HYLINK       AF_HYLINK
 #define PF_APPLETALK    AF_APPLETALK
 #define PF_NETBIOS      AF_NETBIOS
+#define PF_INET6        AF_INET6
 
 #define PF_MAX          AF_MAX