diff --git a/_service b/_service
index 547b079..1ce27e9 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
1.1.17
-->
1.1.17+git%cd.%h
- 27b631162104d90e944cbc107c2d46e983f94ca7
+ 36d2962a8613322fc43d727d95720d61a47d0138
diff --git a/pacemaker-1.1.17+20171011.27b631162.tar.bz2 b/pacemaker-1.1.17+20171011.27b631162.tar.bz2
deleted file mode 100644
index 9237046..0000000
--- a/pacemaker-1.1.17+20171011.27b631162.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e12597492d4d1581ccc5c4ef7d8c34497be2c7f20de8c03441de563201760b13
-size 4228740
diff --git a/pacemaker-1.1.17+20171023.36d2962a8.tar.bz2 b/pacemaker-1.1.17+20171023.36d2962a8.tar.bz2
new file mode 100644
index 0000000..8eab0ab
--- /dev/null
+++ b/pacemaker-1.1.17+20171023.36d2962a8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c22366abd7296c24bc1bfb331a7a854a5d189a32afe326f43317be006ca69c1
+size 4230405
diff --git a/pacemaker.changes b/pacemaker.changes
index 592689b..63851f3 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Oct 24 10:29:38 UTC 2017 - ygao@suse.com
+
+- libpe_status: avoid use-after-free (again)
+- lrmd: don't reject protocol 1.0 clients (bsc#1009076)
+- tools: print descriptive messages for OCF exit code
+- tools: differentiate trace log level for RAs
+- tools: show RAs debug logs only when verbose mode for crm_resource --force-*
+- tools: suppress an invalid error message for crm_resource --force-* options
+- pengine: don't schedule reload and restart in same transition
+- libcrmservice: list systemd agents alphabetically
+- libcrmcommon: add function to sort list alphabetically
+- pengine: new regression test for unrecoverable remote connection
+- libcrmservice: avoid infinite loop on bad DBus reply
+- libcrmservice: list systemd unit files, not only active units
+- libpe_status: print container type in lowercase when outputting XML
+- tools: re-enable crm_resource --lifetime option (CLBZ#5251, bsc#950128)
+- libcrmcluster: improve error checking when updating node name
+- tools: fix crm_resource --why output when resource and node are specified
+- libcrmservice: parse LSB long description correctly
+- libcrmservice: follow LSB standard for header block more strictly
+- libcommon: Erase old exit_reason
+- Upstream version cs: 36d2962a8613322fc43d727d95720d61a47d0138
+
-------------------------------------------------------------------
Fri Oct 13 12:13:50 UTC 2017 - ygao@suse.com
@@ -493,7 +517,7 @@ Mon Mar 6 12:57:23 UTC 2017 - ygao@suse.com
-------------------------------------------------------------------
Mon Mar 6 12:53:50 UTC 2017 - ygao@suse.com
-- spec: Prevent overwriting existing sysconfig files by conditionally running %fillup_only (bsc#1022807)
+- spec: Prevent overwriting existing sysconfig files by conditionally running %fillup_only (bsc#1022807, bsc#980341)
-------------------------------------------------------------------
Mon Mar 6 12:52:25 UTC 2017 - ygao@suse.com
@@ -820,7 +844,7 @@ Mon Feb 29 11:53:36 UTC 2016 - ygao@suse.com
- Fencing: Simplify watchdog integration
- crmd: Only poopulate stonith-watchdog-timeout if SBD is active
- remote: Ensure SBD is consistently configured on remote nodes
-- remote: Allow cluster and remote LRM API versions to diverge
+- remote: Allow cluster and remote LRM API versions to diverge (bsc#1009076)
- cib: Do not send notifications when the dryrun flag is present
- Upstream version cs: cf67796823c4429714857411e614cfacfbc59d89
@@ -1145,7 +1169,7 @@ Fri Jul 10 14:03:00 UTC 2015 - ygao@suse.com
- fencing: use "off" timeout when remapping "reboot" to "off"
- fencing: do not set call options twice in query
- crmd: don't synthesize op failures during shutdown
-- lrmd: prevent double free after unregistering stonith device for monitoring
+- lrmd: prevent double free after unregistering stonith device for monitoring (bsc#1035822)
- libcommon: crm_ipc_get_fd() must set errno on error
- PE: Record the execution date in PE files so we can re-use it in crm_simulate
- pengine: allow guest remote nodes using containers/vms to be nested in a group resource
@@ -1970,7 +1994,7 @@ Thu Mar 13 09:38:46 UTC 2014 - ygao@suse.com
- lrmd: Cancel recurring operations before stop action is executed
- lrmd: Merge duplicate recurring monitor operations
- services: Do not allow duplicate recurring op entries
-- crmd: Ack pending operations that were cancelled due to rsc deletion
+- crmd: Ack pending operations that were cancelled due to rsc deletion (bsc#1035822)
- crm_mon: Add failures to --as-xml output
- cib: Check if on-disk cib is corrupt in the separate on_disk_cib_corrupt() rather than in validate_on_disk_cib() (bnc#866618)
- crmd: Do not start timers for already completed operations
diff --git a/pacemaker.spec b/pacemaker.spec
index b9e3315..d83e756 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -25,7 +25,7 @@
## Where to install Pacemaker documentation
%global pcmk_docdir %{_docdir}/%{name}
-%global commit 1.1.17+20171011.27b631162
+%global commit 1.1.17+20171023.36d2962a8
## Corosync version
%define cs_version 2