diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 49be289..31fbdc1 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -42,12 +42,6 @@
 #include "tnl/t_pipeline.h"
 
 
-static const struct dri_extension gl_21_extension[] = {
-  {"GL_VERSION_2_1", GL_VERSION_2_1_functions },
-};
-
-
-
 /***************************************
  * Mesa's Driver Functions
  ***************************************/
@@ -160,8 +154,6 @@ GLboolean brwCreateContext( int api,
       MIN2(ctx->Const.FragmentProgram.MaxNativeParameters,
 	   ctx->Const.FragmentProgram.MaxEnvParams);
 
-   driInitExtensions(ctx, gl_21_extension, GL_TRUE);
-
    if (intel->is_g4x || intel->gen >= 5) {
       brw->CMD_VF_STATISTICS = CMD_VF_STATISTICS_GM45;
       brw->CMD_PIPELINE_SELECT = CMD_PIPELINE_SELECT_GM45;
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index a066b5b..9ce301b 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -181,6 +181,7 @@ static const struct dri_extension brw_extensions[] = {
    { "GL_ATI_separate_stencil",           GL_ATI_separate_stencil_functions },
    { "GL_ATI_texture_env_combine3",       NULL },
    { "GL_NV_texture_env_combine4",        NULL },
+   { "GL_VERSION_2_1",                    NULL },
    { NULL,                                NULL }
 };