diff --git a/.gitignore b/.gitignore
index deb8ead..bcb98d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pcp-5.2.2.src.tar.gz
+SOURCES/pcp-5.2.3.src.tar.gz
diff --git a/.pcp.metadata b/.pcp.metadata
index e4aef64..ac73ffb 100644
--- a/.pcp.metadata
+++ b/.pcp.metadata
@@ -1 +1 @@
-aafb28965f5b1c8034116890f9eeaac59cece74b SOURCES/pcp-5.2.2.src.tar.gz
+c8addd52498f7dbd90a98f1fed7109a9a0191a8e SOURCES/pcp-5.2.3.src.tar.gz
diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec
index fea9612..4be3c59 100644
--- a/SPECS/pcp.spec
+++ b/SPECS/pcp.spec
@@ -1,5 +1,5 @@
 Name:    pcp
-Version: 5.2.2
+Version: 5.2.3
 Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
@@ -2339,7 +2339,7 @@ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
   grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' |\
   sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list
 ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
-  grep -E -e 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' \
+  grep -E -e 'atop|dmcache|dstat|free|htop|iostat|ipcs|lvmcache|mpstat' \
         -e 'numastat|pidstat|shping|tapestat|uptime|verify' |\
   sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp-system-tools.list
 %endif
@@ -2356,7 +2356,7 @@ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
 
 ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
 %if !%{disable_python2} || !%{disable_python3}
-  grep -E -v 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\
+  grep -E -v 'atop|dmcache|dstat|free|htop|iostat|ipcs|lvmcache|mpstat' |\
   grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\
 %endif
   grep -E -v 'pmlogger_daily_report' |\
@@ -2701,6 +2701,11 @@ then
        %systemd_preun pmie.service
        %systemd_preun pmproxy.service
        %systemd_preun pmcd.service
+       %systemd_preun pmie_daily.timer
+       %systemd_preun pmlogger_daily.timer
+       %systemd_preun pmlogger_daily-poll.timer
+       %systemd_preun pmlogger_check.timer
+
        systemctl stop pmlogger.service >/dev/null 2>&1
        systemctl stop pmie.service >/dev/null 2>&1
        systemctl stop pmproxy.service >/dev/null 2>&1
@@ -2896,6 +2901,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %dir %{_confdir}/labels
 %dir %{_confdir}/labels/optional
 %config(noreplace) %{_confdir}/labels.conf
+%config(noreplace) %{_confdir}/linux/interfaces.conf
 %dir %{_confdir}/pipe.conf.d
 %dir %{_confdir}/pmcd
 %config(noreplace) %{_confdir}/pmcd/pmcd.conf
@@ -3211,6 +3217,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %files pmda-bcc
 %{_pmdasdir}/bcc
 %{_pmdasexecdir}/bcc
+%{_confdir}/bcc
 %endif
 
 %if !%{disable_bpftrace}
@@ -3439,6 +3446,12 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %endif
 
 %changelog
+* Fri Dec 18 2020 Nathan Scott <nathans@redhat.com> - 5.2.3-1
+- Adds a new pcp-htop(1) utility (BZ 1716242)
+- Adds per-process network metrics to pcp-atop(1) (BZ 1733901)
+- Rebase to latest upstream stable release of PCP (BZ 1854035)
+- Resolves an selinux issue in the netcheck agent (BZ 1897719)
+
 * Wed Nov 11 2020 Nathan Scott <nathans@redhat.com> - 5.2.2-1
 - Add online help text for PCP derived metrics (BZ 1670029)
 - Add process accounting metrics and pcp-atop support (BZ 1814526)