diff --git a/05-flatpak-fontpath.conf b/05-flatpak-fontpath.conf
new file mode 100644
index 0000000..b5bd37a
--- /dev/null
+++ b/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/50-flatpak.conf b/50-flatpak.conf
index 430e8f1..27e0964 100644
--- a/50-flatpak.conf
+++ b/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/defaults.json.in b/defaults.json.in
index 709d182..b6fb0a8 100644
--- a/defaults.json.in
+++ b/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/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index 527340a..6968f57 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -3,9 +3,11 @@ Version:        36
 Release:        2%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
+Source2:        usercustomize.py
 Source3:        org.fedoraproject.Platform.appdata.xml
 Source4:        org.fedoraproject.Sdk.appdata.xml
 Source5:        defaults.json.in
+Source6:        05-flatpak-fontpath.conf
 
 License:        MIT
 
@@ -29,19 +31,13 @@ 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
-mkdir -p $RPM_BUILD_ROOT%{python3_sitelib}
-cat > $RPM_BUILD_ROOT%{python3_sitelib}/usercustomize.py <<EOF
-import site
-
-%define _prefix /app
-site.addsitedir("%{python3_sitelib}")
-%if "%{python3_sitelib}" != "%{python3_sitearch}"
-site.addsitedir("%{python3_sitearch}")
-%endif
-%undefine _prefix
-EOF
+for d in %{python3_sitelib} ; do
+    mkdir -p $RPM_BUILD_ROOT/$d
+    install -t $RPM_BUILD_ROOT/$d -m 0644 %{SOURCE2}
+done
 
 # Install appdata for both the Platform and the Sdk
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@@ -51,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}|' \
@@ -91,6 +88,10 @@ HOME=/root /usr/bin/fc-cache -s
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 36-2
+- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags
+- Revert "Fix search paths for /app-installed python modules" (#2026979)
+
 * Thu Aug 04 2022 Kalev Lember <klember@redhat.com> - 36-2
 - Fix search paths for /app-installed python modules (#2112499)