diff --git a/pacemaker.spec b/pacemaker.spec
index 4883a93..6f8dafc 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -18,7 +18,7 @@
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
-%global commit Pacemaker-2.0.0-rc5
+%global commit Pacemaker-2.0.0-rc6
 ## Since git v2.11, the extent of abbreviation is autoscaled by default
 ## (used to be constant of 7), so we need to convey it for non-tags, too.
 %global commit_abbrev 9
@@ -126,7 +126,7 @@
 Name:          pacemaker
 Summary:       Scalable High-Availability cluster resource manager
 Version:       %{pcmkversion}
-Release:       %{pcmk_release}%{?dist}.1
+Release:       %{pcmk_release}%{?dist}
 License:       GPLv2+ and LGPLv2+
 Url:           http://www.clusterlabs.org
 Group:         System Environment/Daemons
@@ -203,6 +203,8 @@ Summary:       Command line tools for controlling Pacemaker clusters
 Group:         System Environment/Daemons
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      perl-TimeDate
+Requires:      procps-ng
+Requires:      psmisc
 Requires(post):coreutils
 
 %description cli
@@ -284,6 +286,8 @@ Summary:       Test framework for cluster-related technologies like Pacemaker
 Group:         System Environment/Daemons
 Requires:      %{python_pkg} >= %{python_min}
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      procps-ng
+Requires:      psmisc
 BuildArch:     noarch
 
 Requires:      %{python_pkg}-systemd
@@ -511,7 +515,6 @@ exit 0
 
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_master
-%{_sbindir}/crm_node
 %{_sbindir}/stonith_admin
 
 %doc %{_mandir}/man7/pacemaker-controld.*
@@ -520,7 +523,6 @@ exit 0
 %doc %{_mandir}/man7/ocf_pacemaker_controld.*
 %doc %{_mandir}/man7/ocf_pacemaker_remote.*
 %doc %{_mandir}/man8/crm_attribute.*
-%doc %{_mandir}/man8/crm_node.*
 %doc %{_mandir}/man8/crm_master.*
 %doc %{_mandir}/man8/pacemakerd.*
 %doc %{_mandir}/man8/stonith_admin.*
@@ -549,6 +551,7 @@ exit 0
 %{_sbindir}/crm_error
 %{_sbindir}/crm_failcount
 %{_sbindir}/crm_mon
+%{_sbindir}/crm_node
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_standby
 %{_sbindir}/crm_verify
@@ -580,7 +583,6 @@ exit 0
 %exclude %{_mandir}/man7/ocf_pacemaker_remote.*
 %doc %{_mandir}/man8/*
 %exclude %{_mandir}/man8/crm_attribute.*
-%exclude %{_mandir}/man8/crm_node.*
 %exclude %{_mandir}/man8/crm_master.*
 %exclude %{_mandir}/man8/fence_legacy.*
 %exclude %{_mandir}/man8/pacemakerd.*
@@ -666,6 +668,15 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Thu Jun 28 2018 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.0-0.1.rc6
+- Update for new upstream tarball for release candidate: Pacemaker-2.0.0-rc6,
+  for full details, see included ChangeLog file or
+  https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.0-rc6
+- Adapt spec file more akin to upstream version including:
+  . new procps-ng and psmisc dependencies with -cli and -cts, for e.g.
+    "ps/sysctl/uptime" and "killall" invocations, respectively (a4ad8183a)
+  . move crm_node to -cli (a94a1ed58)
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.0.0-0.1.rc5.1
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index 3459db5..fcf6268 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pacemaker-2.0.0-rc5.tar.gz) = 10d24955b7b86dd2fdfa1c87a7ce92f1aef6f490a96fdb03b2e4e89d05dc820b556af8c74bd271bb3750b02299baf1c7ebc8af198c6b95c628080da3dbd1c72b
+SHA512 (pacemaker-2.0.0-rc6.tar.gz) = 2e5bd764ff02b20361658dfab05b03260e5f12470c33f25f3907ba965d9e3f1195d17f3240e8e0f18551df6b1227f5b75882f21657a065a5d6a0e8bc7f367ca4
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad