diff --git a/ChangeLog b/ChangeLog
index fefc4345b..b5f3762bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m: fail to build if libFoundation is
+	being used.
+
 2007-05-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxObjectActions.m ([UIxObjectActions
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 1cfc050eb..5a0e50159 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -19,6 +19,11 @@
   02111-1307, USA.
 */
 
+#if LIB_FOUNDATION_LIBRARY
+#error SOGo won't work properly with libFoundation. Please use gnustep-base \
+       instead.
+#endif
+
 #import <NGObjWeb/WEClientCapabilities.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext.h>