diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ff0c5c2..51e2562 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Matthias Klose  <doko@ubuntu.com>
+
+	* config.in: Disable sanity check for kfreebsd.
+
 2012-09-04  Sergey A. Guriev <sergey.a.guriev@intel.com>
 
 	* cpu-ia64-opc.c (ins_cnt6a): New function.
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7bc8a09..26932dd 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Matthias Klose  <doko@ubuntu.com>
+
+	* config.in: Disable sanity check for kfreebsd.
+
 2012-09-06  Cary Coutant  <ccoutant@google.com>
 
 	* dwarf.c (decode_location_expression): Add
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c2446e8..b5302d6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Matthias Klose  <doko@ubuntu.com>
+
+	* config.in: Disable sanity check for kfreebsd.
+
 2012-09-07  Anthony Green  <green@moxielogic.com>
 
 	* config/tc-moxie.c (md_pcrel_from): Branches are now relative
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 7c16d7b..dcb6a8d 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Matthias Klose  <doko@ubuntu.com>
+
+	* config.in: Disable sanity check for kfreebsd.
+
 2012-09-09  Alan Modra  <amodra@gmail.com>
 
 	* target.h (Target::gc_mark_symbol, do_gc_mark_symbol): New functions.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 32503b7..0f91ed5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Matthias Klose  <doko@ubuntu.com>
+
+	* config.in: Disable sanity check for kfreebsd.
+
 2012-09-10  Iain Sandoe  <iain@codesourcery.com>
 
 	* configure.tgt (powerpc-*-elf, et al): Define targ64_extra_emuls
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1cfb715..e6db29e 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Matthias Klose  <doko@ubuntu.com>
+
+	* config.in: Disable sanity check for kfreebsd.
+
 2012-09-04  Sergey A. Guriev <sergey.a.guriev@intel.com>
 
 	* ia64-asmtab.h (completer_index): Extend bitfield to full uint.
--- binutils-2.22.90.20120907.orig/bfd/config.in
+++ binutils-2.22.90.20120907/bfd/config.in
@@ -2,7 +2,7 @@
 
 /* Check that config.h is #included before system headers
     (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1
--- binutils-2.22.90.20120907.orig/gas/config.in
+++ binutils-2.22.90.20120907/gas/config.in
@@ -2,7 +2,7 @@
 
 /* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1
--- binutils-2.22.90.20120907.orig/ld/config.in
+++ binutils-2.22.90.20120907/ld/config.in
@@ -2,7 +2,7 @@
 
 /* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1
--- binutils-2.22.90.20120907.orig/gold/config.in
+++ binutils-2.22.90.20120907/gold/config.in
@@ -2,7 +2,7 @@
 
 /* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1
--- binutils-2.22.90.20120907.orig/opcodes/config.in
+++ binutils-2.22.90.20120907/opcodes/config.in
@@ -2,7 +2,7 @@
 
 /* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1
--- binutils-2.22.90.20120907.orig/binutils/config.in
+++ binutils-2.22.90.20120907/binutils/config.in
@@ -2,7 +2,7 @@
 
 /* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
 #  error config.h must be #included before system headers
 #endif