diff --git a/include/netinet/in.h b/include/netinet/in.h
index 8a2700d6e3..b4d9d1ef02 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -190,7 +190,7 @@ struct sockaddr_in6
   sa_family_t     sin6_family;      /* Address family: AF_INET6 */
   in_port_t       sin6_port;        /* Port in network byte order */
   uint32_t        sin6_flowinfo;    /* IPv6 traffic class and flow information */
-  struct in6_addr sin6_addr;        /* IPv6 internet address */
+  struct in6_addr sin6_addr;        /* IPv6 Internet address */
   uint32_t        sin6_scope_id;    /* Set of interfaces for a scope */
 };
 
diff --git a/include/sys/socket.h b/include/sys/socket.h
index ee918d699f..4a9f2af824 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -228,14 +228,14 @@
   * accommodate all supported protocol-specific address structures, and (2)
   * aligned at an appropriate boundary so that pointers to it can be cast
   * as pointers to protocol-specific address structures and used to access
-  * the fields of those structures without alignment problems
+  * the fields of those structures without alignment problems.
   */
 
 #ifdef CONFIG_NET_IPv6
 struct sockaddr_storage
 {
   sa_family_t ss_family;       /* Address family */
-  char        ss_data[18];     /* 18-bytes of address data */
+  char        ss_data[26];     /* 26-bytes of address data */
 };
 #else
 struct sockaddr_storage