diff --git a/ChangeLog b/ChangeLog
index a7a875cf18..e0717516d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-08  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* bits/in.h (__USE_KERNEL_IPV6_DEFS): Define to 0.
+
 2016-07-08  Aurelien Jarno  <aurelien@aurel32.net>
 
 	[BZ #20240]
diff --git a/bits/in.h b/bits/in.h
index d517115bb2..7dc93c192f 100644
--- a/bits/in.h
+++ b/bits/in.h
@@ -21,6 +21,9 @@
 # error "Never use <bits/in.h> directly; include <netinet/in.h> instead."
 #endif
 
+/* This is the generic version, do not assume a linux-based kernel.  */
+#define __USE_KERNEL_IPV6_DEFS 0
+
 /* To select the IP level.  */
 #define SOL_IP		0