diff --git a/.etckeeper b/.etckeeper
index 9db626b..d377184 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -23,6 +23,7 @@ mkdir -p './dkms/framework.conf.d'
 mkdir -p './dnf/aliases.d'
 mkdir -p './dnf/modules.defaults.d'
 mkdir -p './dnf/plugins/copr.d'
+mkdir -p './egl/egl_external_platform.d'
 mkdir -p './exports.d'
 mkdir -p './fail2ban/fail2ban.d'
 mkdir -p './firewalld/helpers'
@@ -32,7 +33,7 @@ mkdir -p './firewalld/policies'
 mkdir -p './firewalld/services'
 mkdir -p './gdbinit.d'
 mkdir -p './glances'
-mkdir -p './glvnd'
+mkdir -p './glvnd/egl_vendor.d'
 mkdir -p './gnupg'
 mkdir -p './groff/site-font'
 mkdir -p './incron.d'
@@ -103,6 +104,7 @@ mkdir -p './systemd/system/php-fpm.service.d'
 mkdir -p './terminfo'
 mkdir -p './tuned/recommend.d'
 mkdir -p './udev/hwdb.d'
+mkdir -p './xdg/QtProject'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
 maybe chmod 0640 '.gitignore'
@@ -149,6 +151,7 @@ maybe chmod 0755 'X11/applnk'
 maybe chmod 0755 'X11/fontpath.d'
 maybe chmod 0755 'X11/xinit'
 maybe chmod 0755 'X11/xinit/xinitrc.d'
+maybe chmod 0755 'X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh'
 maybe chmod 0755 'X11/xinit/xinitrc.d/50-systemd-user.sh'
 maybe chmod 0755 'X11/xorg.conf.d'
 maybe chmod 0600 'aide.conf'
@@ -166,6 +169,7 @@ maybe chmod 0755 'ansible'
 maybe chmod 0644 'ansible/ansible.cfg'
 maybe chmod 0644 'ansible/hosts'
 maybe chmod 0755 'ansible/roles'
+maybe chmod 0644 'appstream.conf'
 maybe chmod 0755 'asciidoc'
 maybe chmod 0644 'asciidoc/asciidoc.conf'
 maybe chmod 0644 'asciidoc/docbook45.conf'
@@ -632,6 +636,8 @@ maybe chmod 0640 'dovecot/trash.conf'
 maybe chmod 0644 'dracut.conf'
 maybe chmod 0755 'dracut.conf.d'
 maybe chmod 0644 'dracut.conf.d/40-fips.conf'
+maybe chmod 0755 'egl'
+maybe chmod 0755 'egl/egl_external_platform.d'
 maybe chmod 0644 'environment'
 maybe chmod 0755 'environment-modules'
 maybe chmod 0644 'environment-modules/initrc'
@@ -895,6 +901,7 @@ maybe chmod 0644 'gdbinit'
 maybe chmod 0755 'gdbinit.d'
 maybe chmod 0755 'glances'
 maybe chmod 0755 'glvnd'
+maybe chmod 0755 'glvnd/egl_vendor.d'
 maybe chmod 0755 'gnupg'
 maybe chmod 0640 'grc.conf'
 maybe chmod 0640 'grc.fish'
@@ -4992,6 +4999,7 @@ maybe chmod 0644 'rndc.conf'
 maybe chmod 0644 'rpc'
 maybe chmod 0755 'rpm'
 maybe chmod 0644 'rpm/macros.dist'
+maybe chmod 0644 'rpm/macros.zzz-epel-override'
 maybe chmod 0755 'rpmlint'
 maybe chmod 0644 'rpmlint/mingw-rpmlint.config'
 maybe chmod 0755 'rspamd'
@@ -5564,8 +5572,11 @@ maybe chmod 0700 'wireguard'
 maybe chmod 0644 'wireguard/wg0.conf'
 maybe chmod 0644 'xattr.conf'
 maybe chmod 0755 'xdg'
+maybe chmod 0755 'xdg/QtProject'
 maybe chmod 0755 'xdg/autostart'
 maybe chmod 0644 'xdg/autostart/snap-userd-autostart.desktop'
+maybe chmod 0755 'xdg/qtchooser'
+maybe chmod 0644 'xdg/qtchooser/5-64.conf'
 maybe chmod 0755 'xdg/systemd'
 maybe chmod 0600 'xinetd.conf'
 maybe chmod 0755 'xinetd.d'
diff --git a/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh b/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh
new file mode 100755
index 0000000..57071d4
--- /dev/null
+++ b/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -z "$QT_XCB_FORCE_SOFTWARE_OPENGL" ]; then
+
+QT5_CHECK_OPENGL_VERSION=`LANG=C glxinfo 2> /dev/null | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g'` ||:
+
+if [ "$QT5_CHECK_OPENGL_VERSION" == "1" ]; then
+  QT_XCB_FORCE_SOFTWARE_OPENGL=1
+  export QT_XCB_FORCE_SOFTWARE_OPENGL
+fi
+
+unset QT5_CHECK_OPENGL_VERSION
+
+fi
diff --git a/alternatives/qtchooser-5 b/alternatives/qtchooser-5
new file mode 120000
index 0000000..63fe123
--- /dev/null
+++ b/alternatives/qtchooser-5
@@ -0,0 +1 @@
+/etc/xdg/qtchooser/5-64.conf
\ No newline at end of file
diff --git a/alternatives/qtchooser-default b/alternatives/qtchooser-default
new file mode 120000
index 0000000..67538d6
--- /dev/null
+++ b/alternatives/qtchooser-default
@@ -0,0 +1 @@
+/etc/xdg/qtchooser/5.conf
\ No newline at end of file
diff --git a/appstream.conf b/appstream.conf
new file mode 100644
index 0000000..6d5c6e3
--- /dev/null
+++ b/appstream.conf
@@ -0,0 +1,29 @@
+#
+# This is the configuration file for AppStream.
+# If data for your distribution is missing, you can submit
+# a patch to include it upstream.
+# The distribution identifier is fetched from /etc/os-release
+#
+
+[general]
+
+#
+# Set this value to have AppStream always prefer data from a local metainfo file
+# over data provided from a network source.
+# This option is only useful in case one wants to test how data from local
+# metainfo files looks like in the software center prior to making a release
+# containing the new metadata.
+#
+#PreferLocalMetainfoData=true
+
+#
+# Distribution specific settings
+#
+[debian]
+ScreenshotUrl=http://screenshots.debian.net
+
+[opensuse]
+ScreenshotUrl=http://software.opensuse.org/package
+
+[ubuntu]
+ScreenshotUrl=http://screenshots.ubuntu.com
diff --git a/rpm/macros.zzz-epel-override b/rpm/macros.zzz-epel-override
new file mode 100644
index 0000000..d26c90e
--- /dev/null
+++ b/rpm/macros.zzz-epel-override
@@ -0,0 +1,43 @@
+# This file is used _only_ to override macros which exist in RHEL.
+# It should be used very sparingly.
+
+# Override %__python3 here based on %%python3_pkgversion to avoid relying on the finicky
+# python3X-rpm-macros packages.
+# Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/a8b26546eb699afe0dbfcef913a2aa7085fc5afb?branch=rawhide
+#
+# EPEL specific, RHEL defines this in the python3X-rpm-macros packages
+# and the default is /usr/libexec/platform-python.
+# Usually, we don't want EPEL packages to use platform-python.
+# Packages that want to do that can explicitly override this.
+%__python3 /usr/bin/python%{_python3_pkgversion_with_dot}
+
+# RHEL 8's %%pytest does not work properly on non-default Python versions.
+# Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/02536540768555dde6d675935db45df81bcab7bf?branch=rawhide
+# https://bugzilla.redhat.com/show_bug.cgi?id=2091462
+%__pytest /usr/bin/pytest%(test %{python3_pkgversion} == 3 && echo -3 || echo -%{python3_version})
+
+# RHEL 8's %%py3_dist does not work properly on non-default Python versions.
+# This is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1
+# until that lands in RHEL.
+# https://bugzilla.redhat.com/show_bug.cgi?id=2090007
+
+# Creates Python 3 dist tag(s) after converting names to canonical format
+#   Needs to first put all arguments into a list, because invoking a different
+#   macro (%py_dist_name) overwrites them
+%py3_dist() %{lua:\
+        python3_pkgversion_with_dot = rpm.expand("%_python3_pkgversion_with_dot")\
+        args = {}\
+        arg = 1\
+        while (true) do\
+                name = rpm.expand("%{?" .. arg .. ":%{" .. arg .. "}}");\
+                if (name == nil or name == '') then\
+                        break\
+                end\
+                args[arg] = name\
+                arg = arg + 1\
+        end\
+        for arg, name in ipairs(args) do\
+                canonical = rpm.expand("%py_dist_name " .. name);\
+                print("python" .. python3_pkgversion_with_dot .. "dist(" .. canonical .. ") ");\
+        end\
+}
diff --git a/udev/hwdb.bin b/udev/hwdb.bin
index b1c6efd..b4c2140 100644
Binary files a/udev/hwdb.bin and b/udev/hwdb.bin differ
diff --git a/xdg/qtchooser/5-64.conf b/xdg/qtchooser/5-64.conf
new file mode 100644
index 0000000..2e8425e
--- /dev/null
+++ b/xdg/qtchooser/5-64.conf
@@ -0,0 +1,2 @@
+/usr/lib64/qt5/bin
+/usr
diff --git a/xdg/qtchooser/5.conf b/xdg/qtchooser/5.conf
new file mode 120000
index 0000000..0f324d2
--- /dev/null
+++ b/xdg/qtchooser/5.conf
@@ -0,0 +1 @@
+/etc/alternatives/qtchooser-5
\ No newline at end of file
diff --git a/xdg/qtchooser/default.conf b/xdg/qtchooser/default.conf
new file mode 120000
index 0000000..18e2dc4
--- /dev/null
+++ b/xdg/qtchooser/default.conf
@@ -0,0 +1 @@
+/etc/alternatives/qtchooser-default
\ No newline at end of file