diff --git a/pcp.spec b/pcp.spec
index dd29664..2f97090 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,15 +1,12 @@
 Name:    pcp
 Version: 6.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
 
 %global  artifactory https://performancecopilot.jfrog.io/artifactory
-%global  pcp_git_url https://github.com/performancecopilot/pcp/blob
 Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
-Source1: %{pcp_git_url}/main/debian/pcp-testsuite.sysusers
-Source2: %{pcp_git_url}/main/debian/pcp.sysusers
 
 # The additional linker flags break out-of-tree PMDAs.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2043092
@@ -2685,7 +2682,8 @@ done
 %selinux_relabel_pre -s targeted
 %endif
 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
-systemd-sysusers --replace=/usr/lib/sysusers.d/pcp-testsuite.conf - < %{SOURCE1}
+echo u pcpqa - \"PCP Quality Assurance\" %{_testsdir} /bin/bash | \
+  systemd-sysusers --replace=/usr/lib/sysusers.d/pcp-testsuite.conf -
 %else
 getent group pcpqa >/dev/null || groupadd -r pcpqa
 getent passwd pcpqa >/dev/null || \
@@ -2727,7 +2725,8 @@ fi
 
 %pre
 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
-systemd-sysusers --replace=/usr/lib/sysusers.d/pcp.conf - < %{SOURCE2}
+echo u pcp - \"Performance Co-Pilot\" %{_localstatedir}/lib/pcp | \
+  systemd-sysusers --replace=/usr/lib/sysusers.d/pcp.conf -
 %else
 getent group pcp >/dev/null || groupadd -r pcp
 getent passwd pcp >/dev/null || \
@@ -3372,6 +3371,10 @@ fi
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Fri Nov 11 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-2
+- Resolve an issue with installing sysusers entries
+- Fix RPM spec file scriptlet relating to pmieconf (BZ 2139720)
+
 * Thu Oct 27 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-1
 - Resolve a BPF module related build failure (BZ 2132998)
 - Update to latest PCP sources.
diff --git a/sources b/sources
index 4811083..d228945 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 SHA512 (pcp-6.0.1.src.tar.gz) = 922b787a2f28aab6355cb701500890ae83ee93b55047b65f142f9767619b2fbf91abe555106f9aa3f52f851fdb0413a92582dcf8f4dbb49894c2a557e80da5fd
-SHA512 (pcp-testsuite.sysusers) = ee1eec784356eb5e3b6c49645fcf4f49d4d73cabbe6d4fb6745af2979809c25762248daf4d82bb3b11a9442e87bf50afa277116a90cfd50ea83c5bb4f29a25ab
-SHA512 (pcp.sysusers) = c944a80d7ec00635a1e582cce0eeb20f38641179c6539e481f4822fae30caefa4d9462fd61f517364ea1cd37d36bf1828b6540a8a2a948e70151be022321c10d