diff --git a/.gitignore b/.gitignore
index 022b0bb..d6501d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,3 +187,4 @@ mutter-2.31.5.tar.bz2
 /mutter-40.2.1.tar.xz
 /mutter-40.3.tar.xz
 /mutter-40.4.tar.xz
+/mutter-40.6.tar.xz
diff --git a/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch
index 622ce5f..d847397 100644
--- a/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch
+++ b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch
@@ -1,4 +1,4 @@
-From a8746403352be96bae7dfd73ac31fe0253f884b8 Mon Sep 17 00:00:00 2001
+From 9d0ded3178777cd6afcdd5fff7b6f0f39a0d5236 Mon Sep 17 00:00:00 2001
 From: Adam Williamson <awilliam@redhat.com>
 Date: Tue, 9 Mar 2021 17:21:59 -0800
 Subject: [PATCH] Test: deny atomic KMS for "tegra" (RHBZ #1936991)
@@ -19,17 +19,17 @@ index edc03e6c1..d8e3c5f00 100644
  ENV{ID_PATH}=="platform-vkms", TAG+="mutter-device-ignore"
 +DRIVER=="tegra", SUBSYSTEM=="platform", TAG+="mutter-device-disable-atomic-kms"
 diff --git a/src/backends/native/meta-kms-device.c b/src/backends/native/meta-kms-device.c
-index c388096d5..ef65cf82b 100644
+index 85aded9a6..e749ab6b9 100644
 --- a/src/backends/native/meta-kms-device.c
 +++ b/src/backends/native/meta-kms-device.c
-@@ -252,6 +252,7 @@ is_atomic_allowed (const char *driver_name)
-     "vmwgfx",
+@@ -253,6 +253,7 @@ is_atomic_allowed (const char *driver_name)
      "vboxvideo",
      "nvidia-drm",
+     "virtio_gpu",
 +    "tegra",
      NULL,
    };
  
 -- 
-2.28.0
+2.32.0
 
diff --git a/mutter.spec b/mutter.spec
index 99eebeb..41510a3 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -9,8 +9,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:          mutter
-Version:       40.4
-Release:       4%{?dist}
+Version:       40.6
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -204,6 +204,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_datadir}/mutter-%{mutter_api_version}/tests
 
 %changelog
+* Mon Nov 08 2021 Florian Müllner <fmuellner@redhat.com> - 40.6-1
+- Update to 40.6
+  Resolves: #2021064
+
 * Tue Nov  2 2021 Ray Strode <rstrode@redhat.com> - 40.4-4
 - Maintain shift state when doing key repeat in on screen keyboard
   Related: #2010705
diff --git a/sources b/sources
index d47211c..1adb4ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutter-40.4.tar.xz) = a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
+SHA512 (mutter-40.6.tar.xz) = 94301501c431f40bfd144fabb0b0096471981c8e2fd54fee27b6568226ca234d47f75f839648ddadc0acda333d2b7037e5fbad37066d2533efbf341f56599601