diff --git a/ChangeLog b/ChangeLog
index 14caacbe2..e60c7741f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-26  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Headers/Foundation/NSObjCRuntime.h: Add CGFLOAT_MIN and CGFLOAT_MAX
+
 2011-04-14  Adam Fedor  <fedor@gnu.org>
 
 	* VERSION: Bump version
diff --git a/Headers/Foundation/NSObjCRuntime.h b/Headers/Foundation/NSObjCRuntime.h
index ad15986d6..01cbb742c 100644
--- a/Headers/Foundation/NSObjCRuntime.h
+++ b/Headers/Foundation/NSObjCRuntime.h
@@ -31,6 +31,7 @@
 
 #include <stdarg.h>
 #include <limits.h>
+#include <float.h>
 
 #import	<GNUstepBase/GSVersionMacros.h>
 #import	<GNUstepBase/GSConfig.h>
@@ -50,8 +51,12 @@ typedef	uintptr_t	NSUInteger;
 #if     GS_SIZEOF_VOIDP == 8
 #define CGFLOAT_IS_DBL  1
 typedef double          CGFloat;
+#define CGFLOAT_MIN	DBL_MIN
+#define CGFLOAT_MAX	DBL_MAX
 #else
 typedef float           CGFloat;
+#define CGFLOAT_MIN	FLT_MIN
+#define CGFLOAT_MAX	FLT_MAX
 #endif
 #endif /* !defined(CGFLOAT_DEFINED) */