diff --git a/Mesa.changes b/Mesa.changes
index 4993bba..1ff3b6c 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 29 10:00:03 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- re-disable video codecs due to possible patent issues
+  https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15258
+
 -------------------------------------------------------------------
 Tue Sep 27 11:08:54 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 0f1418e..5ff0228 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -29,6 +29,11 @@
 %define _lto_cflags %{nil}
 %endif
 
+# Possible patent issues, see
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15258
+# for more details
+%define video_codecs 0
+
 %define drivers 0
 
 %define glamor 1
@@ -817,7 +822,9 @@ egl_platforms=x11,wayland
             -Dshared-llvm=true \
 %endif
 %if "%{flavor}" == "drivers"
+%if %{video_codecs}
             -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \
+%endif
 %if %{gallium_loader}
             -Dgallium-vdpau=true \
             -Dgallium-xvmc=true \