diff --git a/sdljava.rpmlintrc b/sdljava.rpmlintrc
index 02003cc..333107f 100644
--- a/sdljava.rpmlintrc
+++ b/sdljava.rpmlintrc
@@ -1,5 +1,7 @@
 # We ship a cleaned tarbal with nonfree fonts removed
 addFilter("W: invalid-url Source0: sdljava-0.9.1.tar.gz")
+# Silence warnings about the nonfree font replacement symlinks
+addFilter("W: dangling-symlink .*")
 # The demos do not have docs / manpages, nor do they need these
 addFilter("W: no-manual-page-for-binary .*")
 addFilter("W: no-documentation")
diff --git a/sdljava.spec b/sdljava.spec
index ecfa9eb..73d383a 100644
--- a/sdljava.spec
+++ b/sdljava.spec
@@ -7,7 +7,7 @@
 
 Name:           sdljava
 Version:        0.9.1
-Release:        47%{?dist}
+Release:        48%{?dist}
 Summary:        Java binding to the SDL API
 License:        LGPLv2+
 URL:            http://sdljava.sourceforge.net/
@@ -37,6 +37,8 @@ BuildRequires:  jdom
 BuildRequires:  xml-commons-apis
 BuildRequires:  %{_bindir}/ruby
 BuildRequires:  rubygems
+# To generate the replacement font symlinks for the sdljava-demo testdata
+BuildRequires:  font(dejavusans) fontconfig
 
 Requires:       java
 Requires:       javapackages-filesystem
@@ -191,13 +193,13 @@ popd
 
 #test data
 cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans.ttf \
+ln -s $(fc-match -f "%{file}" "sans") \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf
-ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf \
+ln -s $(fc-match -f "%{file}" "sans:bold") \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf
-ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Oblique.ttf \
+ln -s $(fc-match -f "%{file}" "sans:italic") \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf
-ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \
+ln -s $(fc-match -f "%{file}" "sans:bold:italic") \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf
 
 
@@ -215,6 +217,10 @@ ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \
 
 
 %changelog
+* Mon Mar  9 2020 Hans de Goede <hdegoede@redhat.com> - 0.9.1-48
+- Use fc-match to generate dejavu font file symlinks in -demo in case the
+  file-paths or names change again in the future
+
 * Fri Mar  6 2020 Hans de Goede <hdegoede@redhat.com> - 0.9.1-47
 - Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701)
 - Adjust -demo font paths for F32+ font path changes (rhbz#1806272)