diff --git a/pacemaker.spec b/pacemaker.spec
index 30820da..b3e57ff 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-1.1.18-rc3
+%global commit Pacemaker-1.1.18-rc4
 ## 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
@@ -89,6 +89,10 @@
 ## Add option to ship Upstart job files
 %bcond_with upstart_job
 
+## Add option to turn on SNMP / ESMTP support
+%bcond_with snmp
+%bcond_with esmtp
+
 ## NOTE: skip --without cman
 
 ## Add option to turn off hardening of libraries and daemon executables
@@ -368,6 +372,8 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
 %{configure}                                       \
         %{?with_profiling:   --with-profiling}     \
         %{?with_coverage:    --with-coverage}      \
+        %{!?with_snmp:       --without-snmp}       \
+        %{!?with_esmtp:      --without-esmtp}      \
         %{!?with_doc:        --with-brand=}        \
         %{!?with_hardening:  --disable-hardening}  \
         --with-initdir=%{_initrddir}               \
@@ -687,7 +693,12 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
-* Wed Oct 26 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.18-0.1.rc3
+* Fri Nov 03 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.18-0.1.rc4
+- Update for new upstream tarball for release candidate: Pacemaker-1.1.18-rc4,
+  for full details, see included ChangeLog file or
+  https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.18-rc4
+
+* Thu Oct 26 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.18-0.1.rc3
 - Update for new upstream tarball for release candidate: Pacemaker-1.1.18-rc3,
   for full details, see included ChangeLog file or
   https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.18-rc3
diff --git a/sources b/sources
index e2b84e5..cf768f7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pacemaker-1.1.18-rc3.tar.gz) = b1724e5d163e4b7564c6eb99dd7bf3d933ca6a1ce7dd63c16aa213176f78e002523bae530fd422570ed480901f98c8bbd9a2113e6f0db8cc2a58bd726902b6e8
+SHA512 (pacemaker-1.1.18-rc4.tar.gz) = c0e7b901d87665571cc8b5471f447f9cd483355ee667bb48691d4686a60af45dbf0f717469acfe568c7bc47316fafa1b46ae5723e9e164dcb9befec5a98a4973
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad