diff --git a/_service b/_service
index be20db5..b813c17 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="version">1.1.18</param>
 -->
     <param name="versionformat">1.1.18+git%cd.%h</param>
-    <param name="revision">53a3fe14b15b087bbde9ccb524d11d0a413cc6e9</param>
+    <param name="revision">f36ad364748880815bf00151c516a1f2deae2fed</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/bug-1028138_pacemaker-pacemaker.service-TasksMax.patch b/bug-1028138_pacemaker-pacemaker.service-TasksMax.patch
new file mode 100644
index 0000000..cf26cb3
--- /dev/null
+++ b/bug-1028138_pacemaker-pacemaker.service-TasksMax.patch
@@ -0,0 +1,26 @@
+Index: pacemaker-1.1.18+20171114.f36ad3647/mcp/pacemaker.service.in
+===================================================================
+--- pacemaker-1.1.18+20171114.f36ad3647.orig/mcp/pacemaker.service.in
++++ pacemaker-1.1.18+20171114.f36ad3647/mcp/pacemaker.service.in
+@@ -43,7 +43,7 @@ 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
+Index: pacemaker-1.1.18+20171114.f36ad3647/lrmd/pacemaker_remote.service.in
+===================================================================
+--- pacemaker-1.1.18+20171114.f36ad3647.orig/lrmd/pacemaker_remote.service.in
++++ pacemaker-1.1.18+20171114.f36ad3647/lrmd/pacemaker_remote.service.in
+@@ -23,7 +23,7 @@ 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/pacemaker-1.1.18+20171114.f36ad3647.tar.bz2 b/pacemaker-1.1.18+20171114.f36ad3647.tar.bz2
new file mode 100644
index 0000000..5b9e6b6
--- /dev/null
+++ b/pacemaker-1.1.18+20171114.f36ad3647.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:272ad284e291293249119ed132519bd9806100537f5917178baa540d1a545e09
+size 4240953
diff --git a/pacemaker-1.1.18+20171128.53a3fe14b.tar.bz2 b/pacemaker-1.1.18+20171128.53a3fe14b.tar.bz2
deleted file mode 100644
index 8a369b4..0000000
--- a/pacemaker-1.1.18+20171128.53a3fe14b.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44a2ae8b8b5352ade22f7390b229d7444b1dcda78dc8a0043504d240e09fe473
-size 4141830
diff --git a/pacemaker.changes b/pacemaker.changes
index 8ac67fe..4deb555 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -7,18 +7,9 @@ Wed Nov 29 12:31:43 UTC 2017 - ygao@suse.com
 -------------------------------------------------------------------
 Wed Nov 29 12:05:00 UTC 2017 - ygao@suse.com
 
-- libpe_status: remove support for default-resource-failure-stickiness
-- libpe_status: remove support for resource-failure-stickiness
-- various: remove support for pre-Pacemaker-1.0 CIB XML
-- libpe_status,tools: remove support for legacy ticket state entries
-- various: remove isolation wrapper support
-
-- systemd unit files: enable TasksMax=infinity (bsc#1028138, bsc#1066710)
-  * Drop obsolete bug-1028138_pacemaker-pacemaker.service-TasksMax.patch
-
 - crmd: default record-pending to TRUE
 - tools: enable new crm_resource --cleanup/--refresh behavior
-- Upstream version cs: 53a3fe14b15b087bbde9ccb524d11d0a413cc6e9
+- Upstream version cs: f36ad364748880815bf00151c516a1f2deae2fed
 
 -------------------------------------------------------------------
 Thu Nov 23 13:48:52 UTC 2017 - rbrown@suse.com
@@ -41,7 +32,10 @@ Mon Nov 20 16:20:53 UTC 2017 - ygao@suse.co
 - systemd: add TasksMax comment to pacemaker_remote unit (bsc#1028138, bsc#1066710)
 - tools: make regression test insensitive to line number changes
 - pengine,tools,libpe_status: avoid unnecessary use of pe_find_current
+
 - pacemaker.service: Recommend not to limit tasks (bsc#1028138, bsc#1066710)
+  * Update bug-1028138_pacemaker-pacemaker.service-TasksMax.patch
+
 - tools: set the correct OCF_RESOURCE_INSTANCE env when crm_resource --force-* executes RA
 - typo: overriden -> overridden
 - portability: the difference of time_t values is given by difftime()
diff --git a/pacemaker.spec b/pacemaker.spec
index 5d5ded8..1ccbe00 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -30,7 +30,7 @@
 ## Where to install Pacemaker documentation
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global commit 1.1.18+20171128.53a3fe14b
+%global commit 1.1.18+20171114.f36ad3647
 
 ## Corosync version
 %define cs_version 2
@@ -92,6 +92,7 @@ Patch6:         pacemaker-Wno-format-signedness.patch
 Patch7:         bug-943295_pacemaker-lrmd-log-notice.patch
 Patch8:         bug-977201_pacemaker-controld-self-fencing.patch
 Patch9:         bug-995365_pacemaker-cts-restart-systemd-journald.patch
+Patch10:        bug-1028138_pacemaker-pacemaker.service-TasksMax.patch
 # Required for core functionality
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -307,6 +308,7 @@ manager for Corosync, CMAN and/or Linux-HA.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 
@@ -522,6 +524,7 @@ fi
 %{_libexecdir}/ocf/resource.d/pacemaker/controld
 %{_libexecdir}/ocf/resource.d/pacemaker/o2cb
 %{_libexecdir}/ocf/resource.d/pacemaker/remote
+%{_libexecdir}/ocf/resource.d/.isolation
 
 %if "%{?cs_version}" != "UNKNOWN"
 %if 0%{?cs_version} < 2