diff --git a/.gitignore b/.gitignore
index 8e9527a..6270eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /src/*.c
 /include/GL/*.h
 /build/vc6/*.rc
+/build/*.rc
 /build/*/*.sdf
 /build/*/*.suo
 /build/*/*.vcxproj.user
diff --git a/auto/Makefile b/auto/Makefile
index 33663ac..4caf481 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -212,6 +212,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy
 	cat $(SRC)/glew_init_gl.c >> $@
 	$(BIN)/make_list.pl $(GL_CORE_SPEC) | grep -v '\"GL_VERSION' >> $@
 	$(BIN)/make_list.pl $(GL_EXT_SPEC) >> $@
+	$(BIN)/make_list2.pl $(GL_EXT_SPEC) >> $@
 	echo -e "\n  return GLEW_OK;\n}\n" >> $@
 	echo -e "\n#if defined(_WIN32) && ! defined(GLEW_OSMESA)" >> $@
 	echo -e "\n#if !defined(GLEW_MX)" >> $@
diff --git a/auto/bin/make_list2.pl b/auto/bin/make_list2.pl
new file mode 100755
index 0000000..572fdc9
--- /dev/null
+++ b/auto/bin/make_list2.pl
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+##
+## Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+## Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+##
+## This program is distributed under the terms and conditions of the GNU
+## General Public License Version 2 as published by the Free Software
+## Foundation or, at your option, any later version.
+
+use strict;
+use warnings;
+
+do 'bin/make.pl';
+
+#---------------------------------------------------------------------------------------
+# Extensions that depend on others can be enabled once we know
+# if the one it depends on, is enabled.
+
+my @extlist = ();
+my %extensions = ();
+
+if (@ARGV)
+{
+    @extlist = @ARGV;
+
+	foreach my $ext (sort @extlist)
+	{
+		my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext);
+
+		if ($extname ne $extstring && length($extstring))
+		{
+			my $extvar = $extname;
+			$extvar =~ s/GL(X*)_/GL$1EW_/;
+
+			my $parent = $extstring;
+			$parent =~ s/GL(X*)_/GL$1EW_/;
+
+			print "#ifdef $extname\n";
+			print "  $extvar = $parent;\n";
+			print "#endif /* $extname */\n";
+		}
+	}
+
+}
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
index 353be7f..a8cfec7 100644
--- a/build/cmake/CMakeLists.txt
+++ b/build/cmake/CMakeLists.txt
@@ -39,6 +39,8 @@ else ()
 endif ()
 
 find_package (OpenGL REQUIRED)
+find_package (X11)
+
 set (GLEW_LIBRARIES ${OPENGL_LIBRARIES})
 
 add_definitions (-DGLEW_NO_GLU)
@@ -65,6 +67,7 @@ if (GLEW_OSMESA)
   endif ()
   add_definitions (-DGLEW_OSMESA)
   set (GLEW_LIBRARIES ${OSMESA_LIB_NAME} ${OPENGL_LIBRARIES})
+  set (X11_LIBRARIES)
 endif ()
 
 #### GLEW ####
@@ -116,14 +119,14 @@ if (BUILD_UTILS)
     list (APPEND GLEWINFO_SRC_FILES ${GLEW_DIR}/build/glewinfo.rc)
   endif ()
   add_executable (glewinfo ${GLEWINFO_SRC_FILES})
-  target_link_libraries (glewinfo glew)
+  target_link_libraries (glewinfo glew ${X11_LIBRARIES})
 
   set (VISUALINFO_SRC_FILES ${GLEW_DIR}/src/visualinfo.c)
   if (WIN32)
     list (APPEND VISUALINFO_SRC_FILES ${GLEW_DIR}/build/visualinfo.rc)
   endif ()
   add_executable (visualinfo ${VISUALINFO_SRC_FILES})
-  target_link_libraries (visualinfo glew)
+  target_link_libraries (visualinfo glew ${X11_LIBRARIES}) 
 
   install ( TARGETS glewinfo visualinfo
             DESTINATION bin)