diff --git a/CHANGELOG b/CHANGELOG
index 68954d96..1e79fa6d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,6 +80,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2013-06-29: Simon Goldschmidt
+  * inet6.h: bug #37585/task #12600: fixed struct in6_addr.s6_addr to conform to spec
+
   2013-04-24: patch by Liam <morepork>
   * api_msg.c: patch #8008 Fix a potential null pointer dereference in assert
 
diff --git a/src/include/ipv6/lwip/inet6.h b/src/include/ipv6/lwip/inet6.h
index dbf98df0..8359521b 100644
--- a/src/include/ipv6/lwip/inet6.h
+++ b/src/include/ipv6/lwip/inet6.h
@@ -58,7 +58,7 @@ struct in6_addr {
     u8_t  u8_addr[16];
     u32_t u32_addr[4];
   } un;
-#define s6_addr  un.u32_addr
+#define s6_addr  un.u8_addr
 };
 
 #define IN6ADDR_ANY_INIT {0,0,0,0}