diff --git a/.gitignore b/.gitignore
index bc059e5..118820c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@
 /d0_blind_id-0.8.2.tar.xz
 /darkplaces-0.8.2.tar.xz
 /darkplaces-0.8.5.tar.xz
-/darkplaces-0.8.6.tar.xz
diff --git a/sources b/sources
index ad0ac6c..bee71f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (darkplaces-0.8.6.tar.xz) = 4aaaa70891c499f25d4fddeaa9923fef1408f670fc34a0595a38d7eaae03e47fbcd3da8e7c2b035fcc8c1dd417e0369778b596fd8745198fe6f33feea1b6b64c
+SHA512 (darkplaces-0.8.5.tar.xz) = 03786c682036aa65dc39dcfcbd530cddc778a846df7a98c563396b5129d3eed0168fa47c1079cf4c06c0c1cd60c9e3924ee41ba8b9292835042eaf832c434fd4
diff --git a/xonotic.desktop b/xonotic.desktop
index 233223c..70f4b2a 100644
--- a/xonotic.desktop
+++ b/xonotic.desktop
@@ -7,3 +7,4 @@ Exec=xonotic-sdl-wrapper
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
+PrefersNonDefaultGPU=true
diff --git a/xonotic.spec b/xonotic.spec
index e8b3e03..464b66d 100644
--- a/xonotic.spec
+++ b/xonotic.spec
@@ -1,21 +1,21 @@
 %global _hardened_build 1
-%global dpver 20230620
+%global dpver 20220627
 
 %global dqmirror1 http://distcache.freebsd.org/ports-distfiles/quake-data/quakesw-1.0.6.tar.gz
 %global dqmirror2 https://www.libsdl.org/projects/quake/data/quakesw-1.0.6.tar.gz
 
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: xonotic
-Version: 0.8.6
-Release: 7%{?dist}
-License: GPL-2.0-or-later and LGPL-2.0-or-later
+Version: 0.8.5
+Release: 2%{?dist}
+License: GPLv2+ and LGPLv2+ and BSD
 URL: http://www.xonotic.org/
 # Custom tarball:
 # wget http://dl.xonotic.org/xonotic-%{version}.zip
 # unzip xonotic-%{version}.zip
 # cd Xonotic/source/
 # cp ../misc/logos/icons_png/xonotic_256.png darkplaces/
-# tar -cJf darkplaces-%{version}.tar.xz darkplaces/
+# tar -czf darkplaces-%{version}.tar.xz darkplaces/
 Source0: darkplaces-%{version}.tar.xz
 Source1: %{name}.desktop
 Source10: darkplaces-quake.sh
@@ -52,6 +52,8 @@ focused on providing basic, old style deathmatches.
 Summary: Dedicated server for the Xonotic first person shooter
 Requires: xonotic-data = %{version}
 Requires: darkplaces-server = %{dpver}-%{release}
+Obsoletes: nexuiz-server <= 2.5.2
+Provides: nexuiz-server = %{name}-%{version}
 
 
 %description server
@@ -114,16 +116,16 @@ sed -i 's/\r//' darkplaces.txt
 sed -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
 sed -i 's/nexuiz/xonotic/g' makefile makefile.inc
 
-%patch -P 0 -p2
+%patch0 -p2
 
 %build
 export DP_FS_BASEDIR=%{_datadir}/xonotic
 #export DP_CRYPTO_STATIC_LIBDIR="." 
 #export DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR="."
-make release OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=:
-make cl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=:
-make sdl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=:
-make sv-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=:
+make release OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
+make cl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
+make sdl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
+make sv-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
 
 %install
 rm -rf %{buildroot}
@@ -270,33 +272,6 @@ EOF
 
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Feb 17 2025 Gwyn Ciesla <gwync@protonmail.com> - 0.8.6-6
-- Set PrefersNonDefaultGPU to false, BZ 2345949.
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.8.6-1
-- 0.8.6
-
-* Wed Mar 01 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.8.5-4
-- migrated to SPDX license
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Sun Jul 31 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.8.5-2
 - Correct date.