diff --git a/ChangeLog b/ChangeLog
index ccdc1a282..a0610705f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-13 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/Cocoa/Cocoa.h: Add one more protection around definition
+	of BOOL.
+
 2010-10-13  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSApplication.m (-finishLaunching): Open a new document
diff --git a/Headers/Cocoa/Cocoa.h b/Headers/Cocoa/Cocoa.h
index a5dad1ea0..064b4be51 100644
--- a/Headers/Cocoa/Cocoa.h
+++ b/Headers/Cocoa/Cocoa.h
@@ -37,7 +37,7 @@
 #define M_PI 3.1415926535897932384626433
 #endif
 
-#if (!defined(__cplusplus) && !defined(__USE_ISOC99))
+#if (!defined(__cplusplus) && !defined(__USE_ISOC99) && !defined(__bool_true_false_are_defined))
 typedef BOOL bool;
 #define false NO
 #define true  YES