diff --git a/ChangeLog b/ChangeLog
index d4a02a3f4..f6c3586d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-22  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Additions/GNUstepBase/GSVersionMacros.h:
+	Include header for ObjC2 blocks support if the compiler had that.
+
 2010-06-20  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Version 1.21.1
diff --git a/Headers/Additions/GNUstepBase/GSVersionMacros.h b/Headers/Additions/GNUstepBase/GSVersionMacros.h
index dd7739479..aeaf80c7e 100644
--- a/Headers/Additions/GNUstepBase/GSVersionMacros.h
+++ b/Headers/Additions/GNUstepBase/GSVersionMacros.h
@@ -228,6 +228,15 @@
 
 #define	GS_EXPOSE(X)	(!GS_NONFRAGILE || defined(EXPOSE_##X##_IVARS))
 
+/* Include the appropriate header for ObjC2 blocks support if it is in use.
+ */
+#if __has_feature(blocks)
+#  if	OBJC2RUNTIME
+#    include <objc/blocks_runtime.h>
+#  else
+#    include <ObjectiveC2/blocks_runtime.h>
+#  endif
+#endif