diff --git a/SOURCES/05-flatpak-fontpath.conf b/SOURCES/05-flatpak-fontpath.conf
new file mode 100644
index 0000000..b5bd37a
--- /dev/null
+++ b/SOURCES/05-flatpak-fontpath.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+        <!-- Redefine font directories to generate caches with different id -->
+        <reset-dirs />
+        <dir salt="flatpak">/usr/share/fonts</dir>
+        <dir salt="flatpak">/usr/share/X11/fonts/Type1</dir>
+        <dir salt="flatpak">/usr/share/X11/fonts/TTF</dir>
+        <dir salt="flatpak">/usr/local/share/fonts</dir>
+        <dir salt="flatpak" prefix="xdg">fonts</dir>
+        <dir>~/.fonts</dir>
+</fontconfig>
diff --git a/SOURCES/50-flatpak.conf b/SOURCES/50-flatpak.conf
index 430e8f1..27e0964 100644
--- a/SOURCES/50-flatpak.conf
+++ b/SOURCES/50-flatpak.conf
@@ -21,4 +21,6 @@
 
         <cachedir>/run/host/fonts-cache</cachedir>
         <cachedir>/run/host/user-fonts-cache</cachedir>
+
+        <include>/run/host/font-dirs.xml</include>
 </fontconfig>
diff --git a/SOURCES/defaults.json.in b/SOURCES/defaults.json.in
index 709d182..b6fb0a8 100644
--- a/SOURCES/defaults.json.in
+++ b/SOURCES/defaults.json.in
@@ -3,5 +3,5 @@
   "cflags": "%{build_cflags}",
   "cxxflags": "%{build_cxxflags}",
   "cppflags": "",
-  "ldflags": "-L/app/lib %{build_ldflags}"
+  "ldflags": "-L/app/%{_lib} %{build_ldflags}"
 }
diff --git a/SPECS/flatpak-runtime-config.spec b/SPECS/flatpak-runtime-config.spec
index 8a653cc..f0a2d7e 100644
--- a/SPECS/flatpak-runtime-config.spec
+++ b/SPECS/flatpak-runtime-config.spec
@@ -1,12 +1,13 @@
 Name:           flatpak-runtime-config
 Version:        34
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
 Source2:        usercustomize.py
 Source3:        com.redhat.Platform.appdata.xml
 Source4:        com.redhat.Sdk.appdata.xml
 Source5:        defaults.json.in
+Source6:        05-flatpak-fontpath.conf
 
 License:        MIT
 
@@ -30,6 +31,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/cache/fontconfig
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1}
+install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE6}
 
 # usercustomize.py to set up Python paths
 for d in %{python3_sitelib} ; do
@@ -45,6 +47,7 @@ install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4}
 # Install flatpak-builder config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder
 sed -e 's|%%{_libdir}|%{_libdir}|' \
+    -e 's|%%{_lib}|%{_lib}|' \
     -e 's|%%{build_cflags}|%{build_cflags}|' \
     -e 's|%%{build_cxxflags}|%{build_cxxflags}|' \
     -e 's|%%{build_ldflags}|%{build_ldflags}|' \
@@ -85,6 +88,17 @@ HOME=/root /usr/bin/fc-cache -s
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Fri Mar 24 2023 Tomas Popela <tpopela@redhat.com> - 34-3
+- Sync with Fedora
+- Add a seed for <dir prefix="xdg">fonts</dir> (by tagoh)
+
+* Fri Mar 17 2023 Tomas Popela <tpopela@redhat.com> - 34-2
+- Sync with Fedora
+- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags (by klember)
+- Include fonts-dirs.xml in fontconfig flatpak configuration (by tagoh)
+- Add 05-flatpak-fontpath.conf that forces a different MD5 for fontconfig cache to avoid
+  conflict between caches on host and flatpak (by tagoh)
+
 * Tue Feb 02 2021 Kalev Lember <klember@redhat.com> - 34-1
 - Install flatpak-builder defaults.json config file