diff --git a/_service b/_service
index 26b30f7..ebdd5b9 100644
--- a/_service
+++ b/_service
@@ -8,10 +8,10 @@
     To update to a new release, change "revision" to the desired
     git commit hash and bump "version" if necessary
 
-    <param name="version">1.1.16</param>
+    <param name="version">1.1.17</param>
 -->
-    <param name="versionformat">1.1.16+git%cd.%h</param>
-    <param name="revision">e47bd5bc77a3d1b38589b3716f5112ed39329e7b</param>
+    <param name="versionformat">1.1.17+git%cd.%h</param>
+    <param name="revision">4328c6a65424d1caf9785107664ec1b7fc824664</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/bug-728579_pacemaker-stonith-dev-id.patch b/bug-728579_pacemaker-stonith-dev-id.patch
index de99096..349bd3f 100644
--- a/bug-728579_pacemaker-stonith-dev-id.patch
+++ b/bug-728579_pacemaker-stonith-dev-id.patch
@@ -4,11 +4,11 @@ Date:   Thu Sep 6 15:14:58 2012 +0800
 
     Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable
 
-Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
+Index: pacemaker-1.1.17+20170926.4328c6a65/fencing/commands.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/commands.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
-@@ -826,6 +826,7 @@ build_device_from_xml(xmlNode * msg)
+--- pacemaker-1.1.17+20170926.4328c6a65.orig/fencing/commands.c
++++ pacemaker-1.1.17+20170926.4328c6a65/fencing/commands.c
+@@ -925,6 +925,7 @@ build_device_from_xml(xmlNode * msg)
                   device->id, device->on_target_actions);
      }
  
@@ -16,10 +16,10 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
      device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
      /* TODO: Hook up priority */
  
-Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
+Index: pacemaker-1.1.17+20170926.4328c6a65/lib/fencing/st_client.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/lib/fencing/st_client.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
+--- pacemaker-1.1.17+20170926.4328c6a65.orig/lib/fencing/st_client.c
++++ pacemaker-1.1.17+20170926.4328c6a65/lib/fencing/st_client.c
 @@ -54,6 +54,7 @@ struct stonith_action_s {
      char *action;
      char *victim;
@@ -28,7 +28,7 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
      int timeout;
      int async;
      void *userdata;
-@@ -679,6 +680,7 @@ stonith_action_destroy(stonith_action_t
+@@ -666,6 +667,7 @@ stonith_action_destroy(stonith_action_t
      free(action->args);
      free(action->action);
      free(action->victim);
@@ -36,16 +36,16 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
      free(action);
  }
  
-@@ -706,6 +708,8 @@ stonith_action_create(const char *agent,
+@@ -693,6 +695,8 @@ stonith_action_create(const char *agent,
      if (device_args) {
          char buffer[512];
          const char *value = NULL;
 +        const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
 +        const char *st_dev_id_value = NULL;
  
-         snprintf(buffer, 511, "pcmk_%s_retries", _action);
+         snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
          value = g_hash_table_lookup(device_args, buffer);
-@@ -713,6 +717,11 @@ stonith_action_create(const char *agent,
+@@ -700,6 +704,11 @@ stonith_action_create(const char *agent,
          if (value) {
              action->max_retries = atoi(value);
          }
@@ -57,7 +57,7 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
      }
  
      return action;
-@@ -894,6 +903,8 @@ internal_stonith_action_execute(stonith_
+@@ -881,6 +890,8 @@ internal_stonith_action_execute(stonith_
  
      if (!pid) {
          /* child */
@@ -66,7 +66,7 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
          setpgid(0, 0);
  
          close(1);
-@@ -916,6 +927,10 @@ internal_stonith_action_execute(stonith_
+@@ -903,6 +914,10 @@ internal_stonith_action_execute(stonith_
          close(p_write_fd);
          close(p_stderr_fd);
  
diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch
index 82ddd43..e33ee69 100644
--- a/bug-806256_pacemaker-log-level-notice.patch
+++ b/bug-806256_pacemaker-log-level-notice.patch
@@ -4,11 +4,11 @@ Date:   Thu Mar 14 09:41:53 2013 +0800
 
     Log: Change some messages to notice level (bnc#806256)
 
-Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
+Index: pacemaker-1.1.17+20170727.d134f83b4/crmd/membership.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/crmd/membership.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
-@@ -425,7 +425,7 @@ crm_update_quorum(gboolean quorum, gbool
+--- pacemaker-1.1.17+20170727.d134f83b4.orig/crmd/membership.c
++++ pacemaker-1.1.17+20170727.d134f83b4/crmd/membership.c
+@@ -434,7 +434,7 @@ crm_update_quorum(gboolean quorum, gbool
          crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
  
          fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@@ -16,11 +16,11 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
 +        crm_notice("Updating quorum status to %s (call=%d)", quorum ? "true" : "false", call_id);
          fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete);
          free_xml(update);
-     }
-Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
+ 
+Index: pacemaker-1.1.17+20170727.d134f83b4/crmd/tengine.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/crmd/tengine.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
+--- pacemaker-1.1.17+20170727.d134f83b4.orig/crmd/tengine.c
++++ pacemaker-1.1.17+20170727.d134f83b4/crmd/tengine.c
 @@ -214,7 +214,7 @@ do_te_invoke(long long action,
          destroy_graph(transition_graph);
          transition_graph = unpack_graph(graph_data, graph_input);
@@ -30,11 +30,11 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
                   graph_input);
  
          te_reset_job_counts();
-Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/remote.c
+Index: pacemaker-1.1.17+20170727.d134f83b4/fencing/remote.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/remote.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/remote.c
-@@ -574,7 +574,7 @@ remote_op_timeout(gpointer userdata)
+--- pacemaker-1.1.17+20170727.d134f83b4.orig/fencing/remote.c
++++ pacemaker-1.1.17+20170727.d134f83b4/fencing/remote.c
+@@ -576,7 +576,7 @@ remote_op_timeout(gpointer userdata)
          return FALSE;
      }
  
diff --git a/pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2 b/pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2
deleted file mode 100644
index b17f81d..0000000
--- a/pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b19eeab04a456a70e94cd134caed4d6f39d548f189b4c71bae68099f4d313e7
-size 4046915
diff --git a/pacemaker-1.1.17+20170926.4328c6a65.tar.bz2 b/pacemaker-1.1.17+20170926.4328c6a65.tar.bz2
new file mode 100644
index 0000000..76db137
--- /dev/null
+++ b/pacemaker-1.1.17+20170926.4328c6a65.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2c54df7658e8ea8582a6fd1a06838df5377e6029380fadb4663cca400d14b8a
+size 4221592
diff --git a/pacemaker.changes b/pacemaker.changes
index 442a0f7..ffa39b2 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,169 @@
+-------------------------------------------------------------------
+Fri Sep 29 11:56:01 UTC 2017 - ygao@suse.com
+
+- Log: Reduce verbosity of developer logging
+- PE: We most definitely need to probe connection resources
+- PE: Ensure the bundle nodes get set with the correct discovery mode
+- PE: Implement probing of container remote nodes
+- attrd: Tweak log messages for clarity
+- crm_resource: Do not send history erasure commands for nodes where this is none
+- PE: Resources in bundles should also respect failcounts
+- PE: Do not send notifications to unclean bundles
+- PE: Prevent graph loops when fencing the host out from underneath a bundle
+- Tools: Allow bundle resources to read/write master scores based on the same logic as attrd (cf34f4c)
+- PE: bundle: Send an additional host list when container-attribute-target=host
+- PE: Correctly interpret colocation with bundles
+- PE/attrd: Allow bundle resources to read/write attributes based on the physical host rather than the container name
+- Upstream version cs: 4328c6a65424d1caf9785107664ec1b7fc824664
+
+-------------------------------------------------------------------
+Thu Sep 28 10:22:07 UTC 2017 - ygao@suse.com
+
+- Rebase:
+  * bug-728579_pacemaker-stonith-dev-id.patch
+
+- Fix: -Wformat-truncation=2: prevent format truncation
+- snprintf: use correct signedness in print format specifiers
+- snprintf: use sizeof(X) as size + prevent off-by-ones
+- crmd,libcrmcommon,libcluster,tools: handle PID as string properly
+- tools: use right size for string buffer in fake_transition.c
+- crm_resource: fix a memleak
+- pengine: sprintf -> snprintf
+- libcrmcommon: fix possible infloop in buffer_print
+- crm_snprintf_offset like parts: fix off-by-ones
+- attrd: improve update messages
+- stonithd,lrmd,pengine: spelling/formatting corrections
+- build: install ifspeed resource agent
+- libcrmservices: avoid assert for HB resource with no parameters
+- crmd: re-enable local collection of meta-data for remote nodes
+- crmd,pengine,libpe_status,libpe_rules: remove support for versioned attributes
+- crmd: avoid memory leak when node state is unknown
+- crmd: avoid assert if LRM query fails
+- libpe_status: more error checking when unpacking bundles
+- libpe_status: bundles now respect PCMK_authkey_location
+- libcrmcommon,liblrmd,lrmd: validate PCMK_remote_port
+- PE: Bundles: add support for rkt bundle type
+- libcrmcommon,libpe_rules: unpack new alert filter syntax
+- xml: allow specifying alertable events
+- Fix: a proper calculation of a speed in case of hfi1 for ifspeed RA.
+- pengine: detect proper clone name at startup
+- pengine: don't ignore permanent master scores at startup
+- pengine: handle resource migrating behind a migrating remote connection
+- stonith-ng: advertise pcmk_on_action via metadata
+- liblrmd: Make sure the operation of a remote resource returns if setup of the key fails (bsc#1053463)
+- libcrmcommon,pengine: improve log messages
+- PE: only print to stdout if run from command line
+- crmd: eliminate size restriction on node state xpath
+- pengine: add regression test for remote connect interval wait
+- pengine: re-enable unrecoverable remote fencing
+- pengine: Make sure calculated resource scores are consistent on different architectures (bsc#1054389)
+- PE: Allow resources inside bundles to receive notifications
+- PE: Update unfencing device change test output
+- attrd,crmd: erase attributes at attrd start-up, not first join
+- attrd: accept connections only after CIB connection is active
+- attrd: make CIB connection function self-contained
+- attrd: improve messages
+- stonith-ng: make fencing-device reappear properly after reenabling
+- crmd: don't need meta-data after resource is deleted
+- crmd: only get meta-data for OCF and stonith agents
+- libcrmcommon: generate agent key without :: if no provider
+- pengine: avoid fence loop for remote nodes
+- attrd: don't log error if CIB doesn't have an alerts section
+- PE: Only retrigger unfencing on nodes that ran operations with the old parameters
+- PE: Output resource changes in a friendlier format
+- PE: Attempt to indicate why resources are changing state
+- Mechanism for recording why an action is required
+- Support unfencing of remote nodes
+- PE: Ignore optional unfencing events and report the fencing type
+- Upstream version cs: 20cffae1e9c64217339173c197edac8612ad02b9
+
+-------------------------------------------------------------------
+Mon Jul 31 09:40:31 UTC 2017 - ygao@suse.com
+
+- logging: ensure blackbox gets generated on arithmetic error
+- crm_mon: overcome crm_system_name no longer influenced with argv
+- crm_mon: make CGI bail out on suspicious arguments
+- crm_mon: make CGI bail out properly and w/o help screen
+- crm_mon: canonical casing of Content-Type CGI header field
+- libcrmcommon: handle schema versions properly
+- attrd: don't reconnect to lrmd if already connected
+- PE: Ensure nested container connections run on the same host
+- crmd: send alerts via lrmd
+- lrmd: execute alerts as cluster daemon user
+- libservices: add ability to specify user to run an action
+- libcrmcommon: improve user lookup messages
+- extra: correct ClusterMon metadata
+- attrd: avoid memory leak when disconnecting from lrmd
+- attrd,tools: avoid memory leaks from use of crm_itoa()
+- attrd: be consistent about attr/host logging
+- attrd: delay lrmd connect until needed
+- attrd: add timestamp to alert just when needed
+- attrd: improve log messages
+- libcrmcommon,libpe_rules: avoid crash when alerts section has comments
+- libcrmcommon: add API call for next named XML child
+- liblrmd: only set environment variables with a value
+- attrd,liblrmd: handle adding env var at head of list
+- lrmd: drain alerts at shutdown
+- attrd,lrmd: generate alert sequence number in lrmd
+- liblrmd: better trace message when creating command
+- stonith-ng: avoid double-free of pending-ops in free_device
+- crmd: log correct feature set revision
+- PE: update start-failure-is-fatal help
+- cib: avoid unnecessary memory allocation
+- stonith-ng: add pcmk_delay_base as static base-delay
+- XML: upgrade-1.3.xsl: be explicit about non 1:1 wrt. ACL @attributes
+- enable upgrade XSLTs to use <xsl:message> meaningfully
+- Tools: Added option of --why/Y to crm_resource to inform the status of resources if running or not
+- various: fix spelling in messages and comments
+- cib: reword trace message
+- PE: Prevent use-after-free when creating bundle constraints
+- add versioned operations support
+- TE: don't bump counters when action or synapse is invalid
+- obtain metadata in CRMd via async call
+- tools: add version options for cibsecret
+- alerts: Support of meta attributes(kind, attribute_name).
+- attrd,lrmd,lib: Addition of the transmission function of the attribute alert to attrd.
+- extra: Change alert_xxx.sh.sample for attribute alerts.
+- extra: Change PCMK-MIB.txt for attribute alerts.
+- XML: upgrade-1.3.xsl: simplify branching
+- XML: upgrade-1.3.xsl: drop superfluous branching
+- XML: upgrade-1.3.xsl: simplify "weak identity" transform rules
+- XML: upgrade-1.3.xsl: easy simplifications + redundant declarations drop
+- re-enable versioned attributes
+- Upstream version cs: d134f83b4f0188f6d7cd381c8cdda1a2a7c38bd5
+
+-------------------------------------------------------------------
+Wed Jul 19 14:06:09 UTC 2017 - ygao@suse.com
+
+- Update to version 1.1.17
+- PE: Ensure unrecoverable remote nodes are fenced even if no resources can run on them
+- iso8601: strftime needs fully populated struct tm (bsc#1058844)
+- crmd: abort transition whenever we lose quorum
+- PE: Ensure bundle nodes and child resources are correctly cleaned up
+- PE: Generic ordering for anything with bundles
+- PE: Default to non-interleaved bundle ordering for safety
+- PE: Functional inter-bundle ordering when either side has no child
+- PE: Basic inter-bundle ordering when both sides have children
+- PE: Implement bundle ordering
+- libpe_status: properly disallow other resources from bundle nodes
+- libcib: get remoteness correctly from node status
+- libpe_status: avoid memory leaks when creating bundle remote resource
+- libpe_status: disallow resources on bundle nodes
+- pengine: make checks a little safer
+- PE: Clones within bundles may also have notifications enabled
+- PE: Correctly implement pe_order_implies_first_printed
+- PE: Do not re-add a node's default score for each location constraint
+- PE: Bundle location constraints should only apply to the IP and docker resources
+- PE: Bundles: Allow clones to be colocated with bundles
+- PE: Bundles: Implement colocation of primitives and groups with bundles
+- cib,libcib: support option for IPC eviction threshold
+- libcib: correctly search for v2 patchset changes
+- libcib: always use current values when unpacking config
+- libcrmcluster: fix spelling error in error message
+- crmd: DC should update stonith fail count before aborting transition
+- cib: Broadcasts of cib changes should always pass ACLs check (bsc#1042054)
+- Upstream version cs: b36b869ca8fe74caa077c286304f653f0be117ef (Pacemaker-1.1.17)
+
 -------------------------------------------------------------------
 Fri Jun  2 12:58:32 UTC 2017 - ygao@suse.com
 
@@ -124,7 +290,7 @@ Mon May 15 12:41:35 UTC 2017 - ygao@suse.com
 - PE: Basic allocation of containers
 - Core: Track the line number of callers of crm_(set|clear)_bit
 - xml: Correctly find the first child element
-- PE: Basic container parsing and expansion
+- PE: Basic container parsing and expansion (fate#323415)
 - PE: Correctly test for clone functionality
 - Improve recovery when demote fails with OCF_NOT_RUNNING
 - Upstream version cs: ce86684f5d0672791e9fd3043a84f0931cdd97ea
@@ -168,7 +334,7 @@ Fri Mar 17 11:07:49 UTC 2017 - ygao@suse.com
 -------------------------------------------------------------------
 Thu Mar 16 14:25:19 UTC 2017 - ygao@suse.com
 
-- crmd: new cluster option stonith-max-attempts with default value 10
+- crmd: new cluster option stonith-max-attempts with default value 10 (fate#323417)
 - crmd: Change of the log level and addition of uuid.
 - crmd: use new attrd op to clear fail counts
 - tools: crm_resource -C should clear last-failure
@@ -237,7 +403,7 @@ Mon Mar  6 22:58:46 UTC 2017 - ygao@suse.com
 - crmd: be more resilient when checking an LRM command's "from"
 - crmd: improve crmd's LRM-related log messages
 - tools: properly ignore version with crm_diff --no-version (bsc#888726)
-- Ability to start node in standby
+- Ability to start node in standby (fate#323416)
 - Upstream version cs: a7825f4f0a8db272d1ce0b1f93e8044cbcaa5144
 
 -------------------------------------------------------------------
@@ -256,7 +422,7 @@ Mon Mar  6 13:04:16 UTC 2017 - ygao@suse.com
 - mcp: Correction of the difference in access permission setting.
 - stonith_admin: Addition of the list-targets option.
 - stonith: Check for missing params in new device and dup
-- libservices: treat systemd service reloading as OK
+- libservices: treat systemd service reloading as OK (bsc#1059187)
 - crmd: increase severity when fencing didn't happen (bsc#1011240)
 - rng: Create resources-2.7.rng to update template class validation
 - libcrmcommon: Don't report error if the output file isn't syncable
diff --git a/pacemaker.spec b/pacemaker.spec
index e692836..42cf56f 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.16+20170531.e47bd5bc7
+%global commit 1.1.17+20170926.4328c6a65
 
 ## Corosync version
 %define cs_version 2
@@ -66,12 +66,12 @@
 %endif
 
 Name:           pacemaker
-Version:        1.1.16
+Version:        1.1.17
 Release:        0
 Summary:        Scalable High-Availability cluster resource manager
+# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
 License:        GPL-2.0 and GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Clustering/HA
-# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
 Url:            http://www.clusterlabs.org
 # Hint: use "spectool -s 0 pacemaker.spec" (rpmdevtools) to check the final URL:
 # https://github.com/ClusterLabs/pacemaker/archive/e91769e5a39f5cb2f7b097d3c612368f0530535e/pacemaker-e91769e.tar.gz