diff --git a/docs/features.txt b/docs/features.txt
index 037ee97f240..85ad1a12bd3 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -218,7 +218,7 @@ GL 4.5, GLSL 4.50:
   GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, nvc0, r600, radeonsi)
   GL_ARB_texture_barrier                                DONE (i965, nv50, nvc0, r600, radeonsi)
   GL_KHR_context_flush_control                          DONE (all - but needs GLX/EGL extension to be useful)
-  GL_KHR_robustness                                     DONE (i965)
+  GL_KHR_robustness                                     DONE (i965, nvc0, radeonsi)
   GL_EXT_shader_integer_mix                             DONE (all drivers that support GLSL)
 
 These are the extensions cherry-picked to make GLES 3.1
diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
index dd179794b44..aff4dd3ffd6 100644
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -60,6 +60,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_texture_stencil8 on i965/hsw</li>
 <li>GL_EXT_window_rectangles on nv50, nvc0</li>
 <li>GL_KHR_blend_equation_advanced on i965</li>
+<li>GL_KHR_robustness on nvc0, radeonsi</li>
 <li>GL_KHR_texture_compression_astc_sliced_3d on i965</li>
 <li>GL_OES_copy_image on nv50, nvc0, r600, radeonsi, softpipe, llvmpipe</li>
 <li>GL_OES_geometry_shader on i965/gen8+, nvc0, radeonsi</li>
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 4f422176ad5..2282dc7486e 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1199,6 +1199,8 @@ void st_init_extensions(struct pipe_screen *screen,
       }
    }
 
+   extensions->KHR_robustness = extensions->ARB_robust_buffer_access_behavior;
+
    /* If we support ES 3.1, we support the ES3_1_compatibility ext. However
     * there's no clean way of telling whether we would support ES 3.1 from
     * here, so copy the condition from compute_version_es2 here. A lot of