diff --git a/auto/Makefile b/auto/Makefile
index e05ceef..f0b9e44 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -145,6 +145,9 @@ $(I.DEST)/glew.h: $(EXT)/.dummy
 	perl -e "s/GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;/GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;\nGLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;/" -pi $@
 	rm -f $@.bak
 	cat $(SRC)/glew_tail.h >> $@
+	perl -e "s/GLEW_VERSION_MAJOR_STRING/$(GLEW_MAJOR)/g" -pi $@
+	perl -e "s/GLEW_VERSION_MINOR_STRING/$(GLEW_MINOR)/g" -pi $@
+	perl -e "s/GLEW_VERSION_MICRO_STRING/$(GLEW_MICRO)/g" -pi $@
 
 $(I.DEST)/wglew.h: $(EXT)/.dummy
 	@echo "--------------------------------------------------------------------"
diff --git a/auto/src/glew_init_tail.c b/auto/src/glew_init_tail.c
index 7ae7217..d4cd0d4 100644
--- a/auto/src/glew_init_tail.c
+++ b/auto/src/glew_init_tail.c
@@ -16,16 +16,15 @@ const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error)
 
 const GLubyte * GLEWAPIENTRY glewGetString (GLenum name)
 {
-  static const GLubyte* _glewString[] =
+  switch (name)
   {
-    (const GLubyte*)NULL,
-    (const GLubyte*)"GLEW_VERSION_STRING",
-    (const GLubyte*)"GLEW_VERSION_MAJOR_STRING",
-    (const GLubyte*)"GLEW_VERSION_MINOR_STRING",
-    (const GLubyte*)"GLEW_VERSION_MICRO_STRING"
-  };
-  const size_t max_string = sizeof(_glewString)/sizeof(*_glewString) - 1;
-  return _glewString[(size_t)name > max_string ? 0 : (size_t)name];
+    case GLEW_VERSION:       return (const GLubyte*)"GLEW_VERSION_STRING";
+    case GLEW_VERSION_MAJOR: return (const GLubyte*)"GLEW_VERSION_MAJOR_STRING";
+    case GLEW_VERSION_MINOR: return (const GLubyte*)"GLEW_VERSION_MINOR_STRING";
+    case GLEW_VERSION_MICRO: return (const GLubyte*)"GLEW_VERSION_MICRO_STRING";
+  }
+
+  return NULL;
 }
 
 /* ------------------------------------------------------------------------ */
diff --git a/auto/src/glew_tail.h b/auto/src/glew_tail.h
index bd9be0a..7cb3b55 100644
--- a/auto/src/glew_tail.h
+++ b/auto/src/glew_tail.h
@@ -8,10 +8,10 @@
 #define GLEW_ERROR_GLX_VERSION_11_ONLY 3  /* Need at least GLX 1.2 */
 
 /* string codes */
-#define GLEW_VERSION 1
-#define GLEW_VERSION_MAJOR 2
-#define GLEW_VERSION_MINOR 3
-#define GLEW_VERSION_MICRO 4
+#define GLEW_VERSION GLEW_VERSION_MAJOR_STRINGGLEW_VERSION_MINOR_STRING
+#define GLEW_VERSION_MAJOR GLEW_VERSION_MAJOR_STRING
+#define GLEW_VERSION_MINOR GLEW_VERSION_MINOR_STRING
+#define GLEW_VERSION_MICRO GLEW_VERSION_MICRO_STRING
 
 /* API */
 #ifdef GLEW_MX