diff --git a/ChangeLog b/ChangeLog
index e0a176dcd..c05f463ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-28  Niels Grewe <niels.grewe@halbordnung.de>
+
+	* Source/NSObject.m: Disable atomic ops detection for the time being.
+
 2011-05-27 11:48  David Chisnall <theraven@gna.org>
 
 	* Source/NSAutoreleasePool.m:
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 99e4a831e..d6da11d70 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -190,6 +190,15 @@ static void GSLogZombie(id o, SEL sel)
 #undef	GSATOMICREAD
 #endif
 
+/*
+ * FIXME: Refrain from using atomic builtins until we know how to reliably check
+ * whether they do work with GCC.
+ */
+#ifdef USE_ATOMIC_BUILTINS
+#undef USE_ATOMIC_BUILTINS
+#endif
+
+
 #if	defined(__MINGW__)
 #ifndef _WIN64
 #undef InterlockedIncrement