diff --git a/ChangeLog b/ChangeLog
index 8389fa4ab..2acbab3c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-13  Ivan Leben  <ivan.leben@o-hand.com>
+
+	* clutter/cogl/gl/cogl-defines.h.in:
+	Fix GL function prototypes on OS X by #definining APIENTRY and
+	APIENTRYP if missing.
+
 2008-05-12  Ivan Leben  <ivan.leben@o-hand.com>
 
 	* clutter/cogl/gl/cogl-defines.h.in:
diff --git a/clutter/cogl/gl/cogl-defines.h.in b/clutter/cogl/gl/cogl-defines.h.in
index 7b29b937b..487467752 100644
--- a/clutter/cogl/gl/cogl-defines.h.in
+++ b/clutter/cogl/gl/cogl-defines.h.in
@@ -707,6 +707,14 @@ typedef GLuint COGLuint;
 
 /* Extension function prototypes */
 
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+
 typedef void
   (APIENTRYP             COGL_PFNGLGENRENDERBUFFERSEXTPROC)
   (GLsizei               n,