diff --git a/ChangeLog b/ChangeLog
index b9dbaa1..711eea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-31 Thomas Gamper <icicle@cg.tuwien.ac.at>
+
+	* Source/x11/XGGLFormat.m
+	Check explicitly for GLX_SAMPLES and GLX_SAMPLE_BUFFERS.
+
 2009-10-29 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/gsc/GSGState.m (-_fillRect:withPattern:): Convert the
diff --git a/Source/x11/XGGLFormat.m b/Source/x11/XGGLFormat.m
index ff97264..d4af6bc 100644
--- a/Source/x11/XGGLFormat.m
+++ b/Source/x11/XGGLFormat.m
@@ -256,7 +256,7 @@ do \
 
           case NSOpenGLPFASampleBuffers:
             {
-              #ifdef GLX_VERSION_1_4
+              #ifdef GLX_SAMPLE_BUFFERS
               if ( glxminorversion >= 4 )
                 {
                   ptr++;
@@ -269,7 +269,7 @@ do \
             }
           case NSOpenGLPFASamples:
             {
-              #ifdef GLX_VERSION_1_4
+              #ifdef GLX_SAMPLES
               if ( glxminorversion >= 4 )
                 {
                   ptr++;