diff --git a/Makefile b/Makefile
index ed36ff2..cd4474a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,14 +50,13 @@ TARBALL = ../glew_$(GLEW_VERSION).tar.gz
 
 AR = ar
 INSTALL = install
+STRIP = strip
 RM = rm -f
 LN = ln -sf
 ifeq ($(MAKECMDGOALS), debug)
 OPT = -g
-STRIP =
 else
 OPT = $(POPT)
-STRIP = -s
 endif
 INCLUDE = -Iinclude
 CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
@@ -114,15 +113,12 @@ install: all
 	$(INSTALL) -d -m 0755 $(LIBDIR)
 # runtime
 ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
-	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
+	$(STRIP) -x lib/$(LIB.SHARED)
+	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
 else
-  ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
-	strip -x lib/$(LIB.SHARED)
+	$(STRIP) -x lib/$(LIB.SHARED)
 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
-  else
-	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
-	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
   endif
 endif
 # development files
@@ -132,14 +128,9 @@ endif
 ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
 else
-  ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
 	strip -x lib/$(LIB.STATIC)
 	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
-  else
-	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
-	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
-  endif
 endif
 # utilities
 	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
diff --git a/auto/bin/make.pl b/auto/bin/make.pl
index 8895fd0..c481dc1 100755
--- a/auto/bin/make.pl
+++ b/auto/bin/make.pl
@@ -10,7 +10,7 @@ my %regex = (
     extname  => qr/^[A-Z][A-Za-z0-9_]+$/,
     exturl   => qr/^http.+$/,
     function => qr/^(.+) ([a-z][a-z0-9_]*) \((.+)\)$/i, 
-    token    => qr/^([A-Z][A-Z0-9_]*)\s+((?:0x)?[0-9A-F]+|[A-Z][A-Z0-9_]*)$/,
+    token    => qr/^([A-Z][A-Z0-9_x]*)\s+((?:0x)?[0-9A-F]+|[A-Z][A-Z0-9_]*)$/,
     type     => qr/^typedef\s+(.+)\s+([\*A-Za-z0-9_]+)$/,
     exact    => qr/.*;$/,
 );
diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh
index 74f32b0..f46a5b9 100755
--- a/auto/bin/update_ext.sh
+++ b/auto/bin/update_ext.sh
@@ -56,8 +56,8 @@ if [ ! -d $1 ] ; then
 	GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
 	GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974
 	GL_COLOR_ALPHA_PAIRING_ATI 0x8975
-    GL_SWIZZLE_STRQ_ATI 0x897A
-    GL_SWIZZLE_STRQ_DQ_ATI 0x897B
+	GL_SWIZZLE_STRQ_ATI 0x897A
+	GL_SWIZZLE_STRQ_DQ_ATI 0x897B
 EOT
 
 # fix WGL_ATI_pixel_format_float
@@ -66,6 +66,17 @@ EOT
 	GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
 EOT
 
+# fix WGL_ARB_make_current_read
+    cat >> $1/WGL_ARB_make_current_read <<EOT
+	ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
+	ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
+EOT
+
+# fix WGL_EXT_make_current_read
+    cat >> $1/WGL_EXT_make_current_read <<EOT
+	ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
+EOT
+
 # add typedefs to GL_ARB_vertex_buffer_object; (from personal communication
 # with Marco Fabbricatore).
 #
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index 8a5f6f1..ccd52ae 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -165,14 +165,9 @@ typedef float GLclampf;
 typedef double GLdouble;
 typedef double GLclampd;
 typedef void GLvoid;
-#if defined(_MSC_VER) && _MSC_VER < 1310
-#  ifdef _WIN64
+#if defined(_MSC_VER) && _MSC_VER < 1400
 typedef __int64 GLint64EXT;
 typedef unsigned __int64 GLuint64EXT;
-#  else
-typedef _W64 int GLint64EXT;
-typedef _W64 unsigned int GLuint64EXT;
-#  endif
 #else
 typedef signed long long GLint64EXT;
 typedef unsigned long long GLuint64EXT;