diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 24b6b09..e11d502 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -31,6 +31,8 @@ Release: 1%{?dist}
 
 License: MIT
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
+# bundle urw-fonts if needed
+Source1: urw-fonts-1.0.7pre44.tar.bz2
 Url: http://www.graphicsmagick.org/
 
 ## downstream patches
@@ -77,8 +79,17 @@ BuildRequires: libwebp-devel
 # upgrade path for introduction of -doc subpkg in 1.3.19-4
 Obsoletes: GraphicsMagick < 1.3.19-4
 
+if 0%{?rhel} > 7
+%global urw_font_bundle 1
+%endif
+
+%if 0%{?urw_font_bundle}
+%global urw_font_path %{_datadir}/GraphicsMagick-%{version}/urw-fonts
+%else
+%global urw_font_path %{_datadir}/X11/fonts/urw-fonts
 BuildRequires: urw-base35-fonts-legacy
 Requires: urw-base35-fonts-legacy
+%endif
 
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
@@ -153,6 +164,12 @@ however.
 %prep
 %setup -q
 
+%if 0%{?urw_font_bundle}
+mkdir -p urw-fonts
+tar --directory=urw-fonts/ -xf %{SOURCE1}
+rm -f urw-fonts/ChangeLog urw-fonts/README* urw-fonts/fonts*
+%endif
+
 %patch50 -p1 -b .perl_linkage
 %patch100 -p1 -b .multilib
 
@@ -197,7 +214,7 @@ CFLAGS="$RPM_OPT_FLAGS -DFT_ENCODING_PRC=FT_ENCODING_GB2312"
            --with-xml \
            --without-dps \
            --without-gslib \
-           --with-gs-font-dir=/usr/share/X11/fonts/urw-fonts
+           --with-gs-font-dir=%{urw_font_path}
 
 %make_build
 %if 0%{?perl}
@@ -234,6 +251,12 @@ if [ -z perl-pkg-files ] ; then
 fi
 %endif
 
+%if 0%{?urw_font_bundle}
+mkdir -p %{buildroot}%{urw_font_path}/
+install -p -m644 urw-fonts/* \
+  %{buildroot}%{urw_font_path}/
+%endif
+
 rm -rf %{buildroot}%{_datadir}/GraphicsMagick
 # Keep config
 rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
@@ -333,6 +356,7 @@ exit 1
 * Wed Dec 30 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.36-1
 - 1.3.36
 - fix urw font path, Requires: urw-base35-fonts-legacy (#1847187)
+- bundle urw fonts on epel8+ (no urw-base3-fonts-legacy provided)
 
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 958ae8a..ff8bb4e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (GraphicsMagick-1.3.36.tar.xz) = 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
+SHA512 (urw-fonts-1.0.7pre44.tar.bz2) = ffcd58c7efc8e2a3d09d11282216a1c7917d13d5230548526b010ce3342c629a2c12bc825fb8fc1ec2bb39ae8144cc5c3da8ef5dd6462aa294236036f3bca347
diff --git a/sources.keep b/sources.keep
new file mode 100644
index 0000000..773a3bd
--- /dev/null
+++ b/sources.keep
@@ -0,0 +1 @@
+SHA512 (urw-fonts-1.0.7pre44.tar.bz2) = ffcd58c7efc8e2a3d09d11282216a1c7917d13d5230548526b010ce3342c629a2c12bc825fb8fc1ec2bb39ae8144cc5c3da8ef5dd6462aa294236036f3bca347