diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9af7109b40..44b8b8848e8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-29  Robert Millan  <rmh@gnu.org>
+            Gerald Pfeifer <gerald@pfeifer.com>
+
+	* ginclude/stddef.h [__FreeBSD_kernel__] (__size_t): Do not define.
+	Tweak comment.
+
 2012-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	PR rtl-optimization/52175
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
index a78a7703387..8a03948ee78 100644
--- a/gcc/ginclude/stddef.h
+++ b/gcc/ginclude/stddef.h
@@ -200,8 +200,9 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
 #define ___int_size_t_h
 #define _GCC_SIZE_T
 #define _SIZET_
-#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
-/* __size_t is a typedef on FreeBSD 5!, must not trash it. */
+#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+  || defined(__FreeBSD_kernel__)
+/* __size_t is a typedef on FreeBSD 5, must not trash it. */
 #else
 #define __size_t
 #endif