diff --git a/auto/Makefile b/auto/Makefile
index d8d00f9..6adaea6 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -13,6 +13,7 @@ GLEW_VERSION = $(GLEW_MAJOR).$(GLEW_MINOR).$(GLEW_MICRO)
 
 SHELL = bash
 REGISTRY = registry
+REGISTRY_URL =  http://oss.sgi.com/projects/ogl-sample/registry/
 BIN = bin
 SRC = src
 CORE = core
@@ -26,18 +27,21 @@ I.DEST = $(TOP)/include/GL
 S.DEST = $(TOP)/src
 D.DEST = $(TOP)/doc
 
-TARGETS = $(I.DEST)/glew.h $(I.DEST)/wglew.h $(I.DEST)/glxew.h $(S.DEST)/glew.c $(S.DEST)/glewinfo.c $(D.DEST)/glew.html $(D.DEST)/wglew.html $(D.DEST)/glxew.html
+TARGETS = $(I.DEST)/glew.h $(I.DEST)/wglew.h $(I.DEST)/glxew.h $(S.DEST)/glew.c $(S.DEST)/glewinfo.c \
+	$(D.DEST)/glew.html $(D.DEST)/wglew.html $(D.DEST)/glxew.html
 
 all: $(TARGETS)
 
+registry: $(REGISTRY)/.dummy
 ext: $(EXT)/.dummy
 
 $(REGISTRY)/.dummy: $(BIN)/update_registry.sh
-	$(BIN)/update_registry.sh $(REGISTRY)
+	$(BIN)/update_registry.sh $(REGISTRY) $(REGISTRY_URL)
+	sed -i -e '7s/\<ATI_/GL_ATI_/' $(REGISTRY)/ATI/texture_env_combine3.txt
 	touch $@
 
 $(EXT)/.dummy: $(REGISTRY)/.dummy
-	rm -r -f $(EXT)
+	rm -rf $(EXT)
 	$(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST)
 	find $(CORE) -maxdepth 1 -type f | grep -v VERSION | xargs cp --target-directory=$(EXT)
 	touch $@
diff --git a/auto/bin/make_list.pl b/auto/bin/make_list.pl
index 639dce1..a59f6cd 100755
--- a/auto/bin/make_list.pl
+++ b/auto/bin/make_list.pl
@@ -56,7 +56,7 @@ foreach my $ext (sort @extlist)
     {
         if ($extname =~ /WGL_.*/)
         {
-            print "  if (glewExperimental || $extvar || (!WGLEW_EXT_extensions_string && !WGLEW_ARB_extensions_string)) $extvar = !_glewInit_$extname();\n";
+            print "  if (glewExperimental || $extvar || crippled) $extvar = !_glewInit_$extname();\n";
         }
         else
         {
diff --git a/auto/bin/update_registry.sh b/auto/bin/update_registry.sh
index c15aab5..c7efa51 100755
--- a/auto/bin/update_registry.sh
+++ b/auto/bin/update_registry.sh
@@ -20,6 +20,5 @@ wget                                                    \
     --no-host-directories                               \
     --cut-dirs=3                                        \
     --accept=txt,html                                   \
-    http://oss.sgi.com/projects/ogl-sample/registry/
+    $2
 
-sed -i -e '7s/\<ATI_/GL_ATI_/' ATI/texture_env_combine3.txt
diff --git a/auto/src/glew_wgl.c b/auto/src/glew_wgl.c
index 4fed911..9f3f33d 100644
--- a/auto/src/glew_wgl.c
+++ b/auto/src/glew_wgl.c
@@ -29,9 +29,11 @@ GLboolean wglewGetExtension (const char *name)
 
 static GLuint _wglewInit ()
 {
+  GLboolean crippled;
   /* find wgl extension string query functions */
   _glewInit_WGL_ARB_extensions_string();
   WGLEW_ARB_extensions_string = wglGetExtensionsStringARB != NULL;
   _glewInit_WGL_EXT_extensions_string();
   WGLEW_EXT_extensions_string = wglGetExtensionsStringEXT != NULL;
   /* initialize extensions */
+  crippled = !(WGLEW_ARB_extensions_string || WGLEW_EXT_extensions_string);