diff --git a/.gitignore b/.gitignore
index 12c4bcc..e1b6b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,4 @@ wesnoth-1.8.4.tar.bz2
 /wesnoth-1.17.22.tar.bz2
 /wesnoth-1.17.23.tar.bz2
 /wesnoth-1.17.24.tar.bz2
+/wesnoth-1.17.25.tar.bz2
diff --git a/sources b/sources
index ad130e7..134fdb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wesnoth-1.17.24.tar.bz2) = 5f22b0d28bb5ae5529a35ecf2ae4235c769ebafcc221567a12deea6dfb0b71c8154710bb3eea3257ad1222e11b824c75909b5267ff78070341d7e5d166d3d504
+SHA512 (wesnoth-1.17.25.tar.bz2) = 6045b47d4941622b2820702d7e300560d0c36a84b59a27fc7de606b96a60fb9e33c325185888a8ee5b112604c5a64b594ea07b97473c2f7397c426cfdf4274aa
diff --git a/systemd-paths.patch b/systemd-paths.patch
new file mode 100644
index 0000000..8966bd2
--- /dev/null
+++ b/systemd-paths.patch
@@ -0,0 +1,13 @@
+--- SConstruct~	2024-01-22 15:06:24.073100984 -0600
++++ SConstruct	2024-01-22 15:37:54.659697877 -0600
+@@ -786,8 +786,8 @@
+     env.Alias("install-wesnothd", fifodir)
+ if env["systemd"]:
+     env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.service", "lib/systemd/system")
+-    env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd/tmpfiles.conf", "lib/tmpfiles.d")
+-    env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd/sysusers.conf", "lib/sysusers.d")
++    env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.tmpfiles.conf", "lib/tmpfiles.d")
++    env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.sysusers.conf", "lib/sysusers.d")
+ 
+ # Wesnoth campaign server
+ env.InstallBinary(campaignd)
diff --git a/wesnoth.spec b/wesnoth.spec
index 9780b80..b2279ec 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,8 +1,6 @@
-%global _hardened_build 1
-
 Name:           wesnoth
-Version:        1.17.24
-Release:        2%{?dist}
+Version:        1.17.25
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 License:        GPL-2.0-or-later
@@ -11,6 +9,8 @@ Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
 Source1:        wesnothd.service
 Source2:        %{name}.sysconfig
 Patch0:         scons-env.patch
+# https://github.com/wesnoth/wesnoth/pull/8280
+Patch1:         systemd-paths.patch
 
 Requires:       wesnoth-data = %{version}
 BuildRequires:  gcc-c++
@@ -96,20 +96,24 @@ scons wesnoth wesnothd campaignd prefix=%{_prefix} \
           extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \
           luadir=%{_includedir} \
           fifodir=/run/wesnothd \
+          systemd=True \
           %{?_smp_mflags}
 
 %install
 scons install install-pytools destdir=$RPM_BUILD_ROOT
 
 #Workaround for BZ 1981728
-sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf
+sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf
+
+#Correct user/group
+sed -i "s/_wesnoth/wesnothd/g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf
 
 %if 0%{?flatpak}
 # Fix install paths for flatpak builds where systemd prefix differs from wesnoth prefix
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 mv $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system/wesnothd.service $RPM_BUILD_ROOT%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
-mv $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf $RPM_BUILD_ROOT%{_tmpfilesdir}
+mv $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf $RPM_BUILD_ROOT%{_tmpfilesdir}
 %endif
 
 # extra files we provide
@@ -169,7 +173,8 @@ done
 %attr(0700,wesnothd,wesnothd) %dir /run/wesnothd/
 %ghost /run/wesnothd/socket
 %{_unitdir}/wesnothd.service
-%{_tmpfilesdir}/wesnothd.conf
+%{_tmpfilesdir}/wesnothd.tmpfiles.conf
+%exclude %{_prefix}/lib/sysusers.d/wesnothd.sysusers.conf
 
 %files data -f LANGFILES
 %{_datadir}/applications/org.wesnoth.Wesnoth.desktop
@@ -181,6 +186,9 @@ done
 %{_mandir}/*/man6/wesnoth*.6*
 
 %changelog
+* Mon Jan 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.17.25-1
+- 1.17.25
+
 * Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 1.17.24-2
 - Rebuilt for Boost 1.83