diff --git a/pacemaker.spec b/pacemaker.spec
index 23ab4cc..e10e9d9 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -14,7 +14,7 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 1.1.18
-%global specversion 1
+%global specversion 2
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
@@ -137,6 +137,7 @@ Group:         System Environment/Daemons
 Source0:       https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 Source1:       https://github.com/%{github_owner}/%{nagios_name}/archive/%{nagios_hash}/%{nagios_name}-%{nagios_hash}.tar.gz
 # ---
+Patch0: systemd-make-sure-neither-of-pacemaker-_remoted-is-p.patch
 # keep following commented out for now
 #Patch100: bz1179335-system-wide-crypto-policies.patch
 
@@ -189,7 +190,7 @@ BuildRequires: publican inkscape asciidoc
 %endif
 
 # git-style patch application
-#BuildRequires: git
+BuildRequires: git
 
 %description
 Pacemaker is an advanced, scalable High-Availability cluster resource
@@ -337,9 +338,9 @@ monitor resources.
 
 %prep
 %setup -q -a 1 -n %{name}-%{commit}
-#global __scm git
-#__scm_setup_git
-#autopatch -p1
+%global __scm git
+%__scm_setup_git
+%autopatch -p1
 
 # Force the local time
 #
@@ -694,6 +695,9 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Thu Nov 16 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.18-2
+- Make sure neither of pacemaker{,_remoted} is process-limited
+
 * Wed Nov 15 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.18-1
 - Update for new upstream tarball for release candidate: Pacemaker-1.1.18,
   for full details, see included ChangeLog file or
diff --git a/systemd-make-sure-neither-of-pacemaker-_remoted-is-p.patch b/systemd-make-sure-neither-of-pacemaker-_remoted-is-p.patch
new file mode 100644
index 0000000..3a5f43b
--- /dev/null
+++ b/systemd-make-sure-neither-of-pacemaker-_remoted-is-p.patch
@@ -0,0 +1,44 @@
+From f33c8cffc0789d7544ec29c22fc846b59172af8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
+Date: Thu, 16 Nov 2017 10:43:46 +0100
+Subject: [PATCH] systemd: make sure neither of pacemaker{,_remoted} is
+ process-limited
+
+---
+ lrmd/pacemaker_remote.service.in | 4 +---
+ mcp/pacemaker.service.in         | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/lrmd/pacemaker_remote.service.in b/lrmd/pacemaker_remote.service.in
+index d5717f6d0..13e7df8f4 100644
+--- a/lrmd/pacemaker_remote.service.in
++++ b/lrmd/pacemaker_remote.service.in
+@@ -21,9 +21,7 @@ EnvironmentFile=-@CONFIGDIR@/sbd
+ 
+ ExecStart=@sbindir@/pacemaker_remoted
+ 
+-# Uncomment TasksMax if your systemd version supports it.
+-# Only systemd v227 and above support this option.
+-#TasksMax=infinity
++TasksMax=infinity
+ 
+ # Pacemaker Remote can exit only after all managed services have shut down;
+ # an HA database could conceivably take even longer than this 
+diff --git a/mcp/pacemaker.service.in b/mcp/pacemaker.service.in
+index 516de0f82..a2ab96162 100644
+--- a/mcp/pacemaker.service.in
++++ b/mcp/pacemaker.service.in
+@@ -41,9 +41,7 @@ SuccessExitStatus=100
+ 
+ ExecStart=@sbindir@/pacemakerd -f
+ 
+-# Uncomment TasksMax if your systemd version supports it.
+-# Only systemd v227 and above support this option.
+-#TasksMax=infinity
++TasksMax=infinity
+ 
+ # If pacemakerd doesn't stop, it's probably waiting on a cluster
+ # resource.  Sending -KILL will just get the node fenced
+-- 
+2.15.0
+