diff --git a/ChangeLog b/ChangeLog
index 8d233df..ee64f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-07 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/x11/XGGLFormat.m (-assembleGLXAttributes:): Use
+	GLX_BUFFER_SIZE for NSOpenGLPFAColorSize instead of setting all
+	the single colour sizes, which was wrong.
+
 2011-11-07 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/x11/XGServerEvent.m (initialize_keyboard): Use
diff --git a/Source/x11/XGGLFormat.m b/Source/x11/XGGLFormat.m
index d4af6bc..8491def 100644
--- a/Source/x11/XGGLFormat.m
+++ b/Source/x11/XGGLFormat.m
@@ -164,9 +164,12 @@ do \
           case NSOpenGLPFAColorSize:
             {
                 ptr++;
+                append(GLX_BUFFER_SIZE, *ptr);
+/*
                 append(GLX_RED_SIZE, *ptr);
                 append(GLX_GREEN_SIZE, *ptr);
                 append(GLX_BLUE_SIZE, *ptr);
+*/
                 break;
             }
           case NSOpenGLPFAAlphaSize: