diff --git a/flow-tools.spec b/flow-tools.spec
index a6cf761..1d25637 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -12,9 +12,8 @@
 Version: 0.68.5.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 45%{?dist}
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD 
+Release: 40%{?dist}
+License: BSD 
 URL: http://code.google.com/p/%{name}/
 Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1: flow-capture.service
@@ -35,10 +34,13 @@ BuildRequires: bison
 BuildRequires: flex
 BuildRequires: doxygen
 %if 0%{?fedora} >= 31
-BuildRequires: python3.12
+BuildRequires: /usr/bin/2to3
 %endif
+Requires(pre): shadow-utils
 BuildRequires: systemd-rpm-macros
 BuildRequires: make
+Provides: group(%username)
+Provides: user(%username)
 
 
 %description
@@ -108,7 +110,7 @@ This package contains additional documentation, such as man pages in html format
 # Remove /bin/env deps
 %if 0%{?fedora} >= 31
 sed -i '1s|^#!.*python|#!/usr/bin/python3|' bin/flow*
-python3.12 -m lib2to3 --write --nobackups bin/flow*
+2to3 --write --nobackups bin/flow*
 %else
 sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow*
 %endif
@@ -116,13 +118,7 @@ sed -i '1s|^#!.*perl|#!/usr/bin/perl|' utils/*
 # Fix mariadb-connector-c detection
 sed -i s/my_init/mysql_init/g configure
 
-# Create a sysusers.d config file
-cat >flow-tools.sysusers.conf <<EOF
-u flow-tools - '%{gecos}' %{homedir} -
-EOF
-
 %build
-export CFLAGS="$CFLAGS -std=gnu17"
 %configure \
   --localstatedir=%{_localstatedir}/%{name} \
   --sysconfdir=%{_sysconfdir}/%{name} \
@@ -147,8 +143,12 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/flow-capture.service
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
 
-install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tools.conf
-
+%pre
+getent group %{username} >/dev/null || groupadd -r %{username}
+getent passwd %{username} >/dev/null || \
+    useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
+    -c '%{gecos}' %{username}
+exit 0
 
 
 %post
@@ -220,7 +220,6 @@ install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tool
 %attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
-%{_sysusersdir}/flow-tools.conf
 
 %files devel
 %{_libdir}/*.so
@@ -236,21 +235,6 @@ install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tool
 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-45
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.68.5.1-44
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-43
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 0.68.5.1-42
-- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-41
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild