diff --git a/amanda.spec b/amanda.spec
index 1fa5b50..73f8e9c 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -128,10 +128,16 @@ server also needs to have the amanda-client package installed.
 %prep
 %autosetup -p1 -n %{name}-tag-community-%{version}
 
+# Create a sysusers.d config file
+cat >amanda.sysusers.conf <<EOF
+u amandabackup 33:%amanda_group 'Amanda user' %{_localstatedir}/lib/amanda /bin/bash
+m amandabackup tape
+EOF
+
 %build
 ./autogen
 
-export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie"
+export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE -std=c17" LDFLAGS="$RPM_LD_FLAGS -pie"
 %configure --enable-shared \
            --enable-manpage-build \
            --disable-rpath \
@@ -202,13 +208,16 @@ popd
 rm -rf $RPM_BUILD_ROOT/usr/share/amanda
 find $RPM_BUILD_ROOT -name \*.la | xargs rm
 
+pushd $RPM_BUILD_ROOT/usr/bin
+rm amandad
+ln -s ../%_lib/amanda/amandad
+popd
+
+install -m0644 -D amanda.sysusers.conf %{buildroot}%{_sysusersdir}/amanda.conf
+
 %check
 make check
 
-%pre
-/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
-        -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
-/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || :
 
 %post
 %{?ldconfig}
@@ -294,6 +303,7 @@ make check
 %attr(600,%amanda_user,%amanda_group)   %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
 %attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda
 %attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda/amandad
+%{_sysusersdir}/amanda.conf
 
 %files libs
 %{_libdir}/libamdevice*.so