diff --git a/SOURCES/memcached.conf b/SOURCES/memcached.conf
new file mode 100644
index 0000000..6148205
--- /dev/null
+++ b/SOURCES/memcached.conf
@@ -0,0 +1 @@
+u memcached - "memcached daemon" -
diff --git a/SPECS/memcached.spec b/SPECS/memcached.spec
index ea24265..fca5310 100644
--- a/SPECS/memcached.spec
+++ b/SPECS/memcached.spec
@@ -12,7 +12,7 @@
Name: memcached
Version: 1.6.9
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: High Performance, Distributed Memory Object Cache
@@ -22,6 +22,7 @@ Source0: https://www.memcached.org/files/%{name}-%{version}.tar.gz
Source1: memcached.sysconfig
# SELinux policy sources: https://pagure.io/memcached-selinux/tree/master
Source2: https://releases.pagure.org/memcached-selinux/memcached-selinux-1.0.2.tar.gz
+Source3: memcached.conf
Patch1: memcached-unit.patch
@@ -32,6 +33,7 @@ BuildRequires: perl(Test::More), perl(Test::Harness)
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
%{?with_seccomp:BuildRequires: libseccomp-devel}
%{?with_tls:BuildRequires: openssl-devel}
+BuildRequires: systemd-rpm-macros
Requires(pre): shadow-utils
# Rich dependency syntax - require selinux policy subpackage
@@ -123,12 +125,10 @@ install -d -p %{buildroot}%{_datadir}/selinux/devel/include/%{selinuxmoduletype}
install -m 0644 %{selinuxmodulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages
popd
+install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/memcached.conf
+
%pre
-getent group %{groupname} >/dev/null || groupadd -r %{groupname}
-getent passwd %{username} >/dev/null || \
-useradd -r -g %{groupname} -d /run/memcached \
- -s /sbin/nologin -c "Memcached daemon" %{username}
-exit 0
+%sysusers_create_compat %{SOURCE3}
%pre selinux
%selinux_relabel_pre -s %{selinuxtype}
@@ -163,7 +163,7 @@ fi
%{_mandir}/man1/memcached-tool.1*
%{_mandir}/man1/memcached.1*
%{_unitdir}/memcached.service
-
+%{_sysusersdir}/memcached.conf
%files devel
%{_includedir}/memcached/*
@@ -174,6 +174,10 @@ fi
%license ../%{selinuxmoduledir}/COPYING
%changelog
+* Wed Jun 15 2022 Tomas Korbar <tkorbar@redhat.com> - 0:1.6.9-7
+- Use systemd-users
+- Resolves: rhbz#2095432
+
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.6.9-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688