diff --git a/auto/Makefile b/auto/Makefile
index 8d36233..e6cc60c 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -89,7 +89,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy
 	$(BIN)/make_def.pl WGL $(EXT)/WGL_* >> $@
 	echo -e "\n#endif /* _WIN32 && !GLEW_MX */\n" >> $@
 	echo -e "#if !(defined(_WIN32) || (defined(__APPLE__) && !defined(GLEW_APPLE_GLX)))" >> $@
-	$(BIN)/make_def.pl GLX $(EXT)/GLX_* >> $@
+	$(BIN)/make_def.pl GLX $(CORE)/GLX_VERSION* $(EXT)/GLX_* >> $@
 	echo -e "\n#endif /* !_WIN32 */\n" >> $@
 	$(BIN)/make_init.pl GL $(CORE)/GL_VERSION* >> $@
 	$(BIN)/make_init.pl GL $(EXT)/GL_* >> $@
diff --git a/auto/bin/fix_OML_sync_control.sh b/auto/bin/fix_OML_sync_control.sh
index b34ab9c..e9228c0 100755
--- a/auto/bin/fix_OML_sync_control.sh
+++ b/auto/bin/fix_OML_sync_control.sh
@@ -11,4 +11,7 @@ perl -e 's/#ifdef GLX_OML_sync_control/#if defined(GLX_OML_sync_control) \&\& de
 perl -e 's/(GLEW_EXPORT PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML;)/#ifdef GLX_OML_sync_control\n\1/' -pi $1
 perl -e 's/(GLEW_EXPORT PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML;)/\1\n#endif/' -pi $1
 perl -e 's/(GLEW_EXPORT GLboolean __GLXEW_OML_sync_control;)/#ifdef GLX_OML_sync_control\n\1\n#endif/' -pi $1
+perl -e 's/(PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML = NULL;)/#ifdef GLX_OML_sync_control\n\1/' -pi $1
+perl -e 's/(PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML = NULL;)/\1\n#endif/' -pi $1
+perl -e 's/(GLboolean __GLXEW_OML_sync_control = GL_FALSE;)/#ifdef GLX_OML_sync_control\n\1\n#endif/' -pi $1
 rm -f $1.bak
diff --git a/auto/src/glew_glx.c b/auto/src/glew_glx.c
index 8e02a24..62db716 100644
--- a/auto/src/glew_glx.c
+++ b/auto/src/glew_glx.c
@@ -28,7 +28,7 @@ GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF)
 {
   int major, minor;
   /* initialize core GLX 1.2 */
-  if (_glewInit_GLX_VERSION_1_2(ctx)) return GLEW_ERROR_GLX_VERSION_11_ONLY;
+  if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR)) return GLEW_ERROR_GLX_VERSION_11_ONLY;
   /* initialize flags */
   GLXEW_VERSION_1_0 = GL_FALSE;
   GLXEW_VERSION_1_1 = GL_FALSE;
diff --git a/auto/src/glew_pre.c b/auto/src/glew_pre.c
index 4a1788d..189dc1a 100644
--- a/auto/src/glew_pre.c
+++ b/auto/src/glew_pre.c
@@ -110,4 +110,6 @@ static void *dlGetProcAddress (const GLubyte* name)
 #if !defined(_WIN32) || !defined(GLEW_MX)
 
 GLboolean __GLEW_VERSION_1_1 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_0 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_1 = GL_FALSE;