diff --git a/pcp.spec b/pcp.spec
index 8ba9074..2c789a7 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
-Version: 5.3.5
-Release: 2%{?dist}
+Version: 5.3.6
+Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -2674,10 +2674,8 @@ exit 0
 chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
 %if 0%{?rhel}
 %if !%{disable_systemd}
-    systemctl restart pmcd >/dev/null 2>&1
-    systemctl restart pmlogger >/dev/null 2>&1
-    systemctl enable pmcd >/dev/null 2>&1
-    systemctl enable pmlogger >/dev/null 2>&1
+    systemctl restart pmcd pmlogger >/dev/null 2>&1
+    systemctl enable pmcd pmlogger >/dev/null 2>&1
 %else
     /sbin/chkconfig --add pmcd >/dev/null 2>&1
     /sbin/chkconfig --add pmlogger >/dev/null 2>&1
@@ -2940,8 +2938,7 @@ exit 0
 %preun zeroconf
 if [ "$1" -eq 0 ]
 then
-    %systemd_preun pmlogger_daily_report.timer
-    %systemd_preun pmlogger_daily_report.service
+    %systemd_preun pmlogger_daily_report.timer pmlogger_daily_report.service
 fi
 %endif
 
@@ -2950,38 +2947,19 @@ if [ "$1" -eq 0 ]
 then
     # stop daemons before erasing the package
     %if !%{disable_systemd}
-       %systemd_preun pmlogger.service
-       %systemd_preun pmlogger_farm.service
-       %systemd_preun pmie.service
-       %systemd_preun pmie_farm.service
-       %systemd_preun pmproxy.service
-       %systemd_preun pmcd.service
-       %systemd_preun pmie_daily.timer
-       %systemd_preun pmlogger_daily.timer
-       %systemd_preun pmlogger_check.timer
-       %systemd_preun pmlogger_farm_check.timer
-       %systemd_preun pmie_farm_check.timer
+       %systemd_preun pmlogger_check.timer pmlogger_daily.timer pmlogger_farm_check.timer pmlogger_farm_check.service pmlogger_farm.service pmlogger.service pmie_check.timer pmie_daily.timer pmie_farm_check.timer pmie_farm_check.service pmie_farm.service pmie.service pmproxy.service pmfind.service pmcd.service
 
-       systemctl stop pmlogger.service >/dev/null 2>&1
-       systemctl stop pmlogger_farm.service >/dev/null 2>&1
-       systemctl stop pmie.service >/dev/null 2>&1
-       systemctl stop pmie_farm.service >/dev/null 2>&1
-       systemctl stop pmproxy.service >/dev/null 2>&1
-       systemctl stop pmcd.service >/dev/null 2>&1
+       systemctl stop pmlogger.service pmie.service pmproxy.service pmfind.service pmcd.service >/dev/null 2>&1
     %else
        /sbin/service pmlogger stop >/dev/null 2>&1
-       /sbin/service pmlogger_farm stop >/dev/null 2>&1
        /sbin/service pmie stop >/dev/null 2>&1
-       /sbin/service pmie_farm stop >/dev/null 2>&1
        /sbin/service pmproxy stop >/dev/null 2>&1
        /sbin/service pmcd stop >/dev/null 2>&1
 
        /sbin/chkconfig --del pcp >/dev/null 2>&1
        /sbin/chkconfig --del pmcd >/dev/null 2>&1
        /sbin/chkconfig --del pmlogger >/dev/null 2>&1
-       /sbin/chkconfig --del pmlogger_farm >/dev/null 2>&1
        /sbin/chkconfig --del pmie >/dev/null 2>&1
-       /sbin/chkconfig --del pmie_farm >/dev/null 2>&1
        /sbin/chkconfig --del pmproxy >/dev/null 2>&1
     %endif
     # cleanup namespace state/flag, may still exist
@@ -3004,27 +2982,15 @@ done
 pmieconf -c enable dmthin
 %if 0%{?rhel}
 %if !%{disable_systemd}
-    systemctl restart pmcd >/dev/null 2>&1
-    systemctl restart pmlogger >/dev/null 2>&1
-    systemctl restart pmlogger_farm >/dev/null 2>&1
-    systemctl restart pmie >/dev/null 2>&1
-    systemctl restart pmie_farm >/dev/null 2>&1
-    systemctl enable pmcd >/dev/null 2>&1
-    systemctl enable pmlogger >/dev/null 2>&1
-    systemctl enable pmlogger_farm >/dev/null 2>&1
-    systemctl enable pmie >/dev/null 2>&1
-    systemctl enable pmie_farm >/dev/null 2>&1
+    systemctl restart pmcd pmlogger pmie >/dev/null 2>&1
+    systemctl enable pmcd pmlogger pmie >/dev/null 2>&1
 %else
     /sbin/chkconfig --add pmcd >/dev/null 2>&1
     /sbin/chkconfig --add pmlogger >/dev/null 2>&1
-    /sbin/chkconfig --add pmlogger_farm >/dev/null 2>&1
     /sbin/chkconfig --add pmie >/dev/null 2>&1
-    /sbin/chkconfig --add pmie_farm >/dev/null 2>&1
     /sbin/service pmcd condrestart
     /sbin/service pmlogger condrestart
-    /sbin/service pmlogger_farm condrestart
     /sbin/service pmie condrestart
-    /sbin/service pmie_farm condrestart
 %endif
 %endif
 
@@ -3048,41 +3014,22 @@ PCP_LOG_DIR=%{_logsdir}
     # clean up any stale symlinks for deprecated pm*-poll services
     rm -f %{_sysconfdir}/systemd/system/pm*.requires/pm*-poll.* >/dev/null 2>&1 || true
 
-    # pmlogger_farm service inherits the same initial state as pmlogger service
-    if systemctl is-enabled pmlogger.service >/dev/null; then
-	systemctl enable pmlogger_farm.service pmlogger_farm_check.service
-	systemctl start pmlogger_farm.service pmlogger_farm_check.service
-    fi
-    # pmie_farm service inherits the same initial state as pmie service
-    if systemctl is-enabled pmie.service >/dev/null; then
-	systemctl enable pmie_farm.service pmie_farm_check.service
-	systemctl start pmie_farm.service pmie_farm_check.service
-    fi
-
     %systemd_postun_with_restart pmcd.service
     %systemd_post pmcd.service
     %systemd_postun_with_restart pmlogger.service
     %systemd_post pmlogger.service
-    %systemd_postun_with_restart pmlogger_farm.service
-    %systemd_post pmlogger_farm.service
-    %systemd_post pmlogger_farm_check.service
     %systemd_postun_with_restart pmie.service
     %systemd_post pmie.service
-    %systemd_postun_with_restart pmie_farm.service
-    %systemd_post pmie_farm.service
-    %systemd_post pmie_farm_check.service
-    systemctl condrestart pmproxy.service >/dev/null 2>&1
+    %systemd_postun_with_restart pmproxy.service
+    %systemd_post pmproxy.service
+    %systemd_post pmfind.service
 %else
     /sbin/chkconfig --add pmcd >/dev/null 2>&1
     /sbin/service pmcd condrestart
     /sbin/chkconfig --add pmlogger >/dev/null 2>&1
     /sbin/service pmlogger condrestart
-    /sbin/chkconfig --add pmlogger_farm >/dev/null 2>&1
-    /sbin/service pmlogger_farm condrestart
     /sbin/chkconfig --add pmie >/dev/null 2>&1
     /sbin/service pmie condrestart
-    /sbin/chkconfig --add pmie_farm >/dev/null 2>&1
-    /sbin/service pmie_farm condrestart
     /sbin/chkconfig --add pmproxy >/dev/null 2>&1
     /sbin/service pmproxy condrestart
 %endif
@@ -3382,9 +3329,23 @@ PCP_LOG_DIR=%{_logsdir}
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Wed Feb 02 2022 Nathan Scott <nathans@redhat.com> - 5.3.6-1
+- Update to latest PCP sources.
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
+* Fri Dec 17 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-2
+- pmdabcc: resolve compilation issues of some bcc PMDA modules on
+  aarch64, ppc64le and s390x (BZ 2024982)
+- pmdabpf: support arm and powerpc architectures (BZ 2024980)
+- Further improve pmlogger service startup latency (BZ 1973833)
+- Additional improvements to farm systemd services (BZ 2030138)
+- PMDA indom cache loading performance improvements (BZ 2030122)
+- Resilience improvements for the pmproxy service (BZ 2030141)
+- Resolve failure in the Nvidia metrics agent (BZ 2030123)
+- Updates to pmlogconf persistance changes (BZ 2017632)
+
 * Wed Nov 10 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-1
 - Fix pmlogger services systemd killmode warning (BZ 1897945)
 - Fix python PMDA interface for python 3.10 (BZ 2020038)
diff --git a/sources b/sources
index 71deb6c..4e2782f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcp-5.3.5.src.tar.gz) = d5481e2667d881ebc6a70e842958350e400f0a34cf746a29a97e77150af78d50d6eec5108a4e6fb013025bbd1089828c7cc02cc18220925f0198ed02924dc693
+SHA512 (pcp-5.3.6.src.tar.gz) = f3ab15a87396c543f276a819e2ed18f48412789582be0e59c61e4a8e6a0c4e620c35a198209dadb56ab45b04cc71b89571786676bfd37d1f7d109973448c4557