diff --git a/docs/GL3.txt b/docs/GL3.txt
index 456d76bb956..433a012bb9e 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -161,7 +161,7 @@ GL 4.3, GLSL 4.30:
   GL_ARB_internalformat_query2                         not started
   GL_ARB_invalidate_subdata                            DONE (all drivers)
   GL_ARB_multi_draw_indirect                           DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe)
-  GL_ARB_program_interface_query                       not started
+  GL_ARB_program_interface_query                       DONE (all drivers)
   GL_ARB_robust_buffer_access_behavior                 not started
   GL_ARB_shader_image_size                             not started
   GL_ARB_shader_storage_buffer_object                  not started
@@ -217,7 +217,7 @@ GLES3.1, GLSL ES 3.1
   GL_ARB_draw_indirect                                 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe)
   GL_ARB_explicit_uniform_location                     DONE (all drivers that support GLSL)
   GL_ARB_framebuffer_no_attachments                    not started
-  GL_ARB_program_interface_query                       not started
+  GL_ARB_program_interface_query                       DONE (all drivers)
   GL_ARB_shader_atomic_counters                        DONE (i965)
   GL_ARB_shader_image_load_store                       in progress (curro)
   GL_ARB_shader_storage_buffer_object                  not started
diff --git a/docs/relnotes/10.6.0.html b/docs/relnotes/10.6.0.html
index f69266a2998..82aea5cf96d 100644
--- a/docs/relnotes/10.6.0.html
+++ b/docs/relnotes/10.6.0.html
@@ -53,6 +53,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_uniform_buffer_object on freedreno</li>
 <li>GL_EXT_draw_buffers2 on freedreno</li>
 <li>GL_ARB_clip_control on i965</li>
+<li>GL_ARB_program_interface_query (all drivers)</li>
 </ul>
 
 <h2>Bug fixes</h2>
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f2120153870..861b15006fe 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -139,6 +139,7 @@ static const struct extension extension_table[] = {
    { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },
    { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GLL,            1997 },
    { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },
+   { "GL_ARB_program_interface_query",             o(dummy_true),                              GL,             2012 },
    { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },
    { "GL_ARB_robustness",                          o(dummy_true),                              GL,             2010 },
    { "GL_ARB_sample_shading",                      o(ARB_sample_shading),                      GL,             2009 },