diff --git a/SOURCES/redhat-bugzilla-1930284.patch b/SOURCES/redhat-bugzilla-1930284.patch
new file mode 100644
index 0000000..4b08e71
--- /dev/null
+++ b/SOURCES/redhat-bugzilla-1930284.patch
@@ -0,0 +1,24 @@
+Revert upstream PCP commit e01ab96c813fa31e685ac864031d145f63162088
+
+diff -Naurp pcp-5.2.5.orig/src/pmie/pmie.service.in pcp-5.2.5/src/pmie/pmie.service.in
+--- pcp-5.2.5.orig/src/pmie/pmie.service.in	2021-02-03 09:58:14.000000000 +1100
++++ pcp-5.2.5/src/pmie/pmie.service.in	2021-02-19 10:52:20.786419561 +1100
+@@ -4,6 +4,7 @@ Documentation=man:pmie(1)
+ After=network-online.target pmcd.service
+ Before=pmie_check.timer pmie_daily.timer
+ BindsTo=pmie_check.timer pmie_daily.timer
++Wants=pmcd.service
+ 
+ [Service]
+ Type=notify
+diff -Naurp pcp-5.2.5.orig/src/pmlogger/pmlogger.service.in pcp-5.2.5/src/pmlogger/pmlogger.service.in
+--- pcp-5.2.5.orig/src/pmlogger/pmlogger.service.in	2021-02-03 09:58:14.000000000 +1100
++++ pcp-5.2.5/src/pmlogger/pmlogger.service.in	2021-02-19 10:52:36.111160100 +1100
+@@ -4,6 +4,7 @@ Documentation=man:pmlogger(1)
+ After=network-online.target pmcd.service
+ Before=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
+ BindsTo=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
++Wants=pmcd.service
+ 
+ [Service]
+ Type=notify
diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec
index 732044a..9692b78 100644
--- a/SPECS/pcp.spec
+++ b/SPECS/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 5.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -9,6 +9,7 @@ URL:     https://pcp.io
 Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz
 
 Patch000: redhat-bugzilla-1926756.patch
+Patch001: redhat-bugzilla-1930284.patch
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
 %global __python2 python2
@@ -2247,6 +2248,7 @@ updated policy package.
 %prep
 %setup -q
 %patch000 -p1
+%patch001 -p1
 
 %build
 # fix up build version
@@ -3488,12 +3490,15 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %endif
 
 %changelog
+* Fri Feb 19 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-4
+- Revert removal of pmcd unit dependencies (BZs 1929556, 1930284)
+
 * Fri Feb 12 2021 Mark Goodwin <mgoodwin@redhat.com> - 5.2.5-3
-- specify pmns_name in sockets PMDA Install and Remove scripts
-- add selinux rules for pmcd to use netlink tcpdiag sockets (BZ 1926756)
+- Specify pmns_name in sockets PMDA Install and Remove scripts
+- Add selinux rules for pmcd to use netlink tcpdiag sockets (BZ 1926756)
 
 * Mon Feb 08 2021 Andreas Gerstmayr <agerstmayr@redhat.com> - 5.2.5-2
-- fixed typo in specfile (pcp-testsuite requires pcp-pmda-hacluster
+- Fixed typo in specfile (pcp-testsuite requires pcp-pmda-hacluster
   and pcp-pmda-sockets instead of pcp-pmdas-hacluster etc.)
 
 * Mon Feb 08 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-1