diff --git a/builder/build.sh b/builder/build.sh
index b20f7a3..e5d99d0 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -67,6 +67,11 @@ make -j5
 tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
 
 cd unix/xserver
+# Remove assertion that breaks stock Fedora
+if [ "${KASMVNC_BUILD_OS}" == "fedora" ]; then
+    sed -i '/assert(key->initialized)/d' include/privates.h
+fi
+# Apply patches
 patch -Np1 -i ../xserver${XORG_PATCH}.patch
 case "$XORG_VER" in
   1.20.*)
@@ -91,7 +96,7 @@ if [ ! "${KASMVNC_BUILD_OS}" == "centos" ]; then
 fi
 # remove gl check for opensuse
 if [ "${KASMVNC_BUILD_OS}" == "opensuse" ] || ([ "${KASMVNC_BUILD_OS}" == "oracle" ] && [ "${KASMVNC_BUILD_OS_CODENAME}" == 9 ]); then
-  sed -i 's/LIBGL="gl >= 7.1.0"/LIBGL="gl >= 1.1"/g' configure
+  sed -i 's/LIBGL="gl >= 9.2.0"/LIBGL="gl >= 1.1"/g' configure
 fi
 
 # build X11