diff --git a/CHANGELOG b/CHANGELOG
index 3576b19c..7be2d2ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -229,6 +229,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2010-10-20: Simon Goldschmidt
+  * sockets.h: Fixed bug #31385: sizeof(struct sockaddr) is 30 but should be 16
+
   2010-10-05: Simon Goldschmidt
   * dhcp.c: Once again fixed #30038: DHCP/AutoIP cooperation failed when
     replugging the network cable after an AutoIP address was assigned.
diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
index ccc012db..93c8c11f 100644
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -59,7 +59,7 @@ struct sockaddr_in {
 struct sockaddr {
   u8_t sa_len;
   u8_t sa_family;
-  u16_t sa_data[14];
+  char sa_data[14];
 };
 
 #ifndef socklen_t