diff --git a/docs/features.txt b/docs/features.txt
index 30914e848e7..e9f3717fdf1 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -506,6 +506,7 @@ Khronos extensions that are not part of any Vulkan version:
   VK_KHR_acceleration_structure                         DONE (anv/gfx12.5+, lvp, radv/gfx10.3+)
   VK_KHR_android_surface                                not started
   VK_KHR_calibrated_timestamps                          DONE (anv, nvk, radv)
+  VK_KHR_compute_shader_derivatives                     DONE (anv)
   VK_KHR_cooperative_matrix                             DONE (anv, radv/gfx11+)
   VK_KHR_deferred_host_operations                       DONE (anv, hasvk, lvp, radv)
   VK_KHR_display                                        DONE (anv, nvk, pvr, radv, tu, v3dv)
diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index 2f37870ee82..36436aa9c37 100644
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -9,3 +9,4 @@ VK_KHR_dynamic_rendering_local_read on nvk
 GL_ARB_timer_query on Panfrost
 GL_EXT_disjoint_timer_query on Panfrost
 VK_KHR_pipeline_binary on RADV
+VK_KHR_compute_shader_derivatives on anv
diff --git a/src/intel/vulkan/anv_physical_device.c b/src/intel/vulkan/anv_physical_device.c
index eec94c5358b..808eda8d300 100644
--- a/src/intel/vulkan/anv_physical_device.c
+++ b/src/intel/vulkan/anv_physical_device.c
@@ -73,6 +73,7 @@ get_device_extensions(const struct anv_physical_device *device,
       .KHR_bind_memory2                      = true,
       .KHR_buffer_device_address             = true,
       .KHR_calibrated_timestamps             = device->has_reg_timestamp,
+      .KHR_compute_shader_derivatives        = true,
       .KHR_copy_commands2                    = true,
       .KHR_cooperative_matrix                = anv_has_cooperative_matrix(device),
       .KHR_create_renderpass2                = true,
@@ -477,7 +478,7 @@ get_features(const struct anv_physical_device *pdevice,
       /* VK_EXT_image_sliced_view_of_3d */
       .imageSlicedViewOf3D = true,
 
-      /* VK_NV_compute_shader_derivatives */
+      /* VK_KHR_compute_shader_derivatives */
       .computeDerivativeGroupQuads = true,
       .computeDerivativeGroupLinear = true,
 
@@ -1300,6 +1301,11 @@ get_properties(const struct anv_physical_device *pdevice,
       props->minAccelerationStructureScratchOffsetAlignment = 64;
    }
 
+   /* VK_KHR_compute_shader_derivatives */
+   {
+      props->meshAndTaskShaderDerivatives = pdevice->info.has_mesh_shading;
+   }
+
    /* VK_KHR_fragment_shading_rate */
    {
       props->primitiveFragmentShadingRateWithMultipleViewports =