diff --git a/sqlgrey.spec b/sqlgrey.spec
index f8b9ea6..7c7bbc3 100644
--- a/sqlgrey.spec
+++ b/sqlgrey.spec
@@ -1,9 +1,8 @@
 Name:           sqlgrey
 Version:        1.8.0
-Release:        33%{?dist}
+Release:        24%{?dist}
 Summary:        Postfix grey-listing policy service
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://sqlgrey.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sqlgrey/sqlgrey-%{version}.tar.gz
 Source1:        sqlgrey.service
@@ -13,6 +12,7 @@ BuildArch:      noarch
 
 Requires:               postfix
 Requires:               perl(DBD::SQLite)
+Requires(pre): shadow-utils
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -30,33 +30,26 @@ to 90% of junk mails (spam and virus) before they reach your Postfix server
 
 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-
-# Create a sysusers.d config file
-cat >sqlgrey.sysusers.conf <<EOF
-u sqlgrey - 'SQLgrey server' /var/lib/sqlgrey -
-EOF
+%patch0 -p1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make rh-install ROOTDIR=$RPM_BUILD_ROOT SBINDIR=$RPM_BUILD_ROOT/usr/bin
+make rh-install ROOTDIR=$RPM_BUILD_ROOT
 install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/sqlgrey.service
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_var}/lib
 mkdir -m 750 $RPM_BUILD_ROOT%{_var}/lib/sqlgrey
 touch $RPM_BUILD_ROOT%{_var}/lib/sqlgrey/sqlgrey.db
 
-install -m0644 -D sqlgrey.sysusers.conf %{buildroot}%{_sysusersdir}/sqlgrey.conf
-
 %files
 %doc Changelog CONTRIB COPYING FAQ HOWTO README* TODO
 %{_unitdir}/sqlgrey.service
-%{_bindir}/sqlgrey
-%{_bindir}/update_sqlgrey_config
+%{_sbindir}/sqlgrey
+%{_sbindir}/update_sqlgrey_config
 %{_bindir}/sqlgrey-logstats.pl
 %{_mandir}/man1/sqlgrey.1*
 %attr(-,sqlgrey,sqlgrey) %dir %{_var}/lib/sqlgrey
@@ -69,8 +62,13 @@ install -m0644 -D sqlgrey.sysusers.conf %{buildroot}%{_sysusersdir}/sqlgrey.conf
 %config(noreplace) %{_sysconfdir}/sqlgrey/*.regexp
 # Warning admins to not touch the above files
 %attr(644,root,root) %config %{_sysconfdir}/sqlgrey/README
-%{_sysusersdir}/sqlgrey.conf
 
+%pre
+getent group sqlgrey >/dev/null || groupadd -r sqlgrey
+getent passwd sqlgrey >/dev/null || \
+    useradd -r -g sqlgrey -d /var/lib/sqlgrey -s /sbin/nologin \
+    -c "SQLgrey server" sqlgrey
+exit 0
 
 %post
 %systemd_post sqlgrey.service
@@ -82,33 +80,6 @@ install -m0644 -D sqlgrey.sysusers.conf %{buildroot}%{_sysusersdir}/sqlgrey.conf
 %systemd_postun_with_restart sqlgrey.service
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.8.0-32
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sat Feb 08 2025 Kevin Fenzi <kevin@scrye.com> - 1.8.0-31
-- Adjust to sbin/bin consolidation. Fixes FTBFS rhbz#2341376
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.8.0-29
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild