diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec
index e2e24b4..e343125 100644
--- a/fedora/SPECS/kodi.spec
+++ b/fedora/SPECS/kodi.spec
@@ -2,7 +2,7 @@
 %global myRELEASE  1
 #global GITCOMMIT Gotham_r2-ge988513
 # use the line below for pre-releases
-# global DIRVERSION #{version}#{PRERELEASE}
+#global DIRVERSION %{version}%{PRERELEASE}
 %global DIRVERSION %{version}
 %global _hardened_build 1
 
@@ -92,6 +92,7 @@ BuildRequires: SDL2-devel
 BuildRequires: SDL_image-devel
 BuildRequires: a52dec-devel
 BuildRequires: afpfs-ng-devel
+BuildRequires: alsa-lib-devel
 BuildRequires: avahi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: boost-devel
@@ -139,6 +140,7 @@ BuildRequires: lame-devel
 BuildRequires: lcms2-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXmu-devel
+BuildRequires: libXrandr-devel
 BuildRequires: libXtst-devel
 BuildRequires: libass-devel >= 0.9.7
 %if 0%{?_with_libbluray}
@@ -382,6 +384,11 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
   tools/EventClients/Clients/KodiSend/kodi-send.py \
   tools/EventClients/lib/python/xbmcclient.py
 
+%if 0%{?fedora} < 32
+# Fix python binary search
+sed -i 's/  pkg_check_modules(PC_PYTHON python>=2.7 QUIET)/  pkg_check_modules(PC_PYTHON python=2.7 QUIET)/' cmake/modules/FindPython.cmake
+%endif
+
 
 %build
 mkdir {fedora-gbm,fedora-wayland,fedora-x11}
@@ -435,6 +442,9 @@ done
 # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
 rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
 
+#rm -f ${RPM_BUILD_ROOT}%{_libdir}/debug/usr/bin/*.debug
+#/usr/lib/debug/usr/bin/kodi-wiiremote-18.4-99.1.r.fc31.x86_64.debug
+
 desktop-file-install \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
  $RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop
@@ -479,6 +489,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/TexturePacker
+%{_bindir}/kodi-wiiremote
 %dir %{_libdir}/kodi/
 %{_libdir}/kodi/addons/
 %{_libdir}/kodi/system/
@@ -541,6 +552,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
 
 
 %changelog
+* Fri Nov 1 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
+- Build for FC31.
+
 * Sat Sep 14 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
 - Update to 18.4
 
diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec
index 3a1c56d..54c1646 100644
--- a/fedora/SPECS/polemarch.spec
+++ b/fedora/SPECS/polemarch.spec
@@ -70,6 +70,8 @@ mv %{buildroot}/var/run %{buildroot}/
 install -d %{buildroot}/%{_var}/log/%{name}
 install -d %{buildroot}/opt/%{datad}
 ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb
+# remove buildroot path in opt/polemarch/bin/activate.xsh:
+sed -i -e 's|/root/rpmbuild/BUILDROOT/polemarch.*x86_64||' %{buildroot}/opt/polemarch/bin/activate.xsh
 
 %pre
 getent group %{user} >/dev/null || \