diff --git a/extra/gst-plugins-bad/PKGBUILD b/extra/gst-plugins-bad/PKGBUILD
index 2ce5bfdb2..871994300 100644
--- a/extra/gst-plugins-bad/PKGBUILD
+++ b/extra/gst-plugins-bad/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=gst-plugins-bad
 pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv gst-plugin-wpe)
 pkgver=1.18.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Multimedia graph framework - bad plugins"
 url="https://gstreamer.freedesktop.org/"
 arch=(x86_64)
@@ -28,10 +28,8 @@ makedepends=(mjpegtools curl chromaprint libmms faad2 libdca libdvdnav
 checkdepends=(xorg-server-xvfb)
 options=(!emptydirs)
 _commit=8cb03bdf01ca6ad8c87f951bcd7962c3ca9f6860  # tags/1.18.4^0
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit"
-         gst-plugins-bad-openexr3.patch)
-sha256sums=('SKIP'
-            '6bf2b72021586efa41b35507beedb939e952cfd612ce50f5f9e704cf1bd1d876')
+source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
@@ -40,7 +38,8 @@ pkgver() {
 
 prepare() {
   cd $pkgbase
-  patch -p1 < ../gst-plugins-bad-openexr3.patch # Fix build with OpenEXR 3
+  git cherry-pick -n 68858358544dd3b7e20663f731db22fd74a78a45 # fix build with GCC 11
+  git cherry-pick -n a9fafd98b74fd184b178604095d35ac6105119b8 # fix build with OpenEXR 3
 }
 
 build() {
diff --git a/extra/gst-plugins-bad/gst-plugins-bad-openexr3.patch b/extra/gst-plugins-bad/gst-plugins-bad-openexr3.patch
deleted file mode 100644
index 14d272550..000000000
--- a/extra/gst-plugins-bad/gst-plugins-bad-openexr3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ext/openexr/gstopenexrdec.cpp b/ext/openexr/gstopenexrdec.cpp
-index eeb316cb1..32b1d03c3 100644
---- a/ext/openexr/gstopenexrdec.cpp
-+++ b/ext/openexr/gstopenexrdec.cpp
-@@ -29,6 +29,7 @@
- 
- #include <ImfRgbaFile.h>
- #include <ImfIO.h>
-+#include <ImfInt64.h>
- using namespace Imf;
- using namespace Imath;
-