diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec
index f325157..074e28d 100644
--- a/gstreamer1-plugins-base.spec
+++ b/gstreamer1-plugins-base.spec
@@ -6,7 +6,7 @@
 
 Name:           gstreamer1-plugins-base
 Version:        1.18.4
-Release:        4%{?gitcommit:.git%{shortcommit}}%{?dist}
+Release:        5%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework base plugins
 
 License:        LGPLv2+
@@ -20,6 +20,8 @@ Source0:        http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugin
 %endif
 Patch0:         0001-missing-plugins-Remove-the-mpegaudioversion-field.patch
 
+Patch1:	        xdg-compile.patch
+
 BuildRequires:  meson >= 0.48.0
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -114,6 +116,7 @@ for the GStreamer Base Plugins library.
 %prep
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %meson \
@@ -289,9 +292,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0
 %{_bindir}/gst-discoverer-%{majorminor}
 %{_bindir}/gst-play-%{majorminor}
 %{_bindir}/gst-device-monitor-%{majorminor}
-%{_mandir}/man1/gst-discoverer-*.gz
-%{_mandir}/man1/gst-play-*.gz
-%{_mandir}/man1/gst-device-monitor-*.gz
+%{_mandir}/man1/gst-discoverer-*
+%{_mandir}/man1/gst-play-*
+%{_mandir}/man1/gst-device-monitor-*
 
 
 %files devel
@@ -478,6 +481,11 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0
 %endif
 
 %changelog
+* Fri Jan 14 2022 Wim Taymans <wtaymans@redhat.com> - 1.18.4-5
+- Handle both compressed and uncompressed man pages
+- Fix build with small patch
+- Resolves: rhbz#2005247
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/xdg-compile.patch b/xdg-compile.patch
new file mode 100644
index 0000000..410a14e
--- /dev/null
+++ b/xdg-compile.patch
@@ -0,0 +1,12 @@
+diff -ru gst-plugins-base-1.18.4/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h gst-plugins-base-1.18.4.new/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
+--- gst-plugins-base-1.18.4/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h	2021-03-15 18:48:01.251275800 +0100
++++ gst-plugins-base-1.18.4.new/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h	2022-01-14 16:53:07.235319602 +0100
+@@ -22,7 +22,7 @@
+ #define __GST_GL_WINDOW_WAYLAND_EGL_H__
+ 
+ #include <wayland-client.h>
+-#include "xdg-shell-client-protocol.h"
++#include "../xdg-shell-client-protocol.h"
+ #include <wayland-egl.h>
+ #include <wayland-cursor.h>
+