diff --git a/docs/features.txt b/docs/features.txt
index e4378f0f45d..f114ee65a70 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -525,7 +525,7 @@ Khronos extensions that are not part of any Vulkan version:
   VK_KHR_line_rasterization                             DONE (anv, nvk, radv, tu, v3dv)
   VK_KHR_load_store_op_none                             DONE (anv, nvk, radv, tu, v3dv)
   VK_KHR_maintenance5                                   DONE (anv, lvp, nvk, radv, tu)
-  VK_KHR_maintenance6                                   DONE (anv, lvp)
+  VK_KHR_maintenance6                                   DONE (anv, lvp, nvk)
   VK_KHR_performance_query                              DONE (anv, radv/gfx10.3+, tu, v3dv)
   VK_KHR_pipeline_executable_properties                 DONE (anv, nvk, hasvk, radv, tu, v3dv)
   VK_KHR_pipeline_library                               DONE (anv, lvp, nvk, radv, tu, vn)
diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index 1f4bf558830..81699c15ce9 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -116,6 +116,7 @@ nvk_get_device_extensions(const struct nvk_instance *instance,
       .KHR_maintenance3 = true,
       .KHR_maintenance4 = true,
       .KHR_maintenance5 = true,
+      .KHR_maintenance6 = true,
       .KHR_map_memory2 = true,
       .KHR_multiview = true,
       .KHR_pipeline_executable_properties = true,
@@ -398,6 +399,9 @@ nvk_get_device_features(const struct nv_device_info *info,
       /* VK_KHR_maintenance5 */
       .maintenance5 = true,
 
+      /* VK_KHR_maintenance6 */
+      .maintenance6 = true,
+
       /* VK_KHR_pipeline_executable_properties */
       .pipelineExecutableInfo = true,
 
@@ -863,6 +867,11 @@ nvk_get_device_properties(const struct nvk_instance *instance,
       .nonStrictSinglePixelWideLinesUseParallelogram = false,
       .nonStrictWideLinesUseParallelogram = false,
 
+      /* VK_KHR_maintenance6 */
+      .blockTexelViewCompatibleMultipleLayers = true,
+      .maxCombinedImageSamplerDescriptorCount = 3,
+      .fragmentShadingRateClampCombinerInputs = false, /* TODO */
+
       /* VK_EXT_map_memory_placed */
       .minPlacedMemoryMapAlignment = os_page_size,