diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 10a2519..6b760da 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jun  3 03:11:44 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to 21.1.2
+  * second bugfix
+  * mostly AMD and Intel changes as usual, but also a decent amount
+    of ARM fixes and more.
+
+-------------------------------------------------------------------
+Wed Jun  2 09:27:33 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer autoselect Mesa-dri-nouveau at all; autoselect 
+  libvdpau_nouveau depending on PCI ID (boo#1186721)
+
 -------------------------------------------------------------------
 Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index fe02d00..30a1f54 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -41,7 +41,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 21.1.1
+%define _version 21.1.2
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -114,7 +114,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        21.1.1
+Version:        21.1.2
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -493,7 +493,6 @@ compiling programs and libraries using the DRI API.
 Summary:        Mesa DRI plug-in for 3D acceleration via Nouveau
 Group:          System/Libraries
 Requires:       Mesa = %{version}
-Supplements:    xf86-video-nouveau
 
 %description -n Mesa-dri-nouveau
 This package contains nouveau_dri.so, which is necessary for
@@ -589,7 +588,8 @@ videos and artefacts all over.
 %package -n libvdpau_nouveau
 Summary:        XVMC state tracker for Nouveau
 Group:          System/Libraries
-Supplements:    xf86-video-nouveau
+Supplements:    modalias(pci:v000010DEd*sv*sd*bc03sc*i*)
+Supplements:    modalias(pci:v000012D2d*sv*sd*bc03sc*i*)
 
 %description -n libvdpau_nouveau
 This package contains the VDPAU state tracker for Nouveau.
diff --git a/Mesa.changes b/Mesa.changes
index 10a2519..6b760da 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jun  3 03:11:44 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to 21.1.2
+  * second bugfix
+  * mostly AMD and Intel changes as usual, but also a decent amount
+    of ARM fixes and more.
+
+-------------------------------------------------------------------
+Wed Jun  2 09:27:33 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer autoselect Mesa-dri-nouveau at all; autoselect 
+  libvdpau_nouveau depending on PCI ID (boo#1186721)
+
 -------------------------------------------------------------------
 Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 4363800..1b65215 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -40,7 +40,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 21.1.1
+%define _version 21.1.2
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -113,7 +113,7 @@
 %endif
 
 Name:           Mesa
-Version:        21.1.1
+Version:        21.1.2
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -492,7 +492,6 @@ compiling programs and libraries using the DRI API.
 Summary:        Mesa DRI plug-in for 3D acceleration via Nouveau
 Group:          System/Libraries
 Requires:       Mesa = %{version}
-Supplements:    xf86-video-nouveau
 
 %description -n Mesa-dri-nouveau
 This package contains nouveau_dri.so, which is necessary for
@@ -588,7 +587,8 @@ videos and artefacts all over.
 %package -n libvdpau_nouveau
 Summary:        XVMC state tracker for Nouveau
 Group:          System/Libraries
-Supplements:    xf86-video-nouveau
+Supplements:    modalias(pci:v000010DEd*sv*sd*bc03sc*i*)
+Supplements:    modalias(pci:v000012D2d*sv*sd*bc03sc*i*)
 
 %description -n libvdpau_nouveau
 This package contains the VDPAU state tracker for Nouveau.
diff --git a/mesa-21.1.1.tar.xz b/mesa-21.1.1.tar.xz
deleted file mode 100644
index 8ee7ffc..0000000
--- a/mesa-21.1.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eec25ea379054e8911bc5de816aeb50f581b5b708414725003d2f00386b38dd2
-size 15169732
diff --git a/mesa-21.1.1.tar.xz.sig b/mesa-21.1.1.tar.xz.sig
deleted file mode 100644
index 9c67a6f..0000000
Binary files a/mesa-21.1.1.tar.xz.sig and /dev/null differ
diff --git a/mesa-21.1.2.tar.xz b/mesa-21.1.2.tar.xz
new file mode 100644
index 0000000..89ab039
--- /dev/null
+++ b/mesa-21.1.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23b4b63760561f3a4f98b5be12c6de621e9a6bdf355e087a83d9184cd4e2825f
+size 15199892
diff --git a/mesa-21.1.2.tar.xz.sig b/mesa-21.1.2.tar.xz.sig
new file mode 100644
index 0000000..7e8d2bb
Binary files /dev/null and b/mesa-21.1.2.tar.xz.sig differ