diff --git a/_service b/_service
index 571ea61..61af58c 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="version">1.1.11</param>
 -->
     <param name="versionformat">1.1.11+git%cd.%h</param>
-    <param name="revision">f7859e2e06c8cf320482c3e4b447ddbe0a96fe83</param>
+    <param name="revision">42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.11+git20140415.f7859e2.tar.bz2 b/pacemaker-1.1.11+git20140415.f7859e2.tar.bz2
deleted file mode 100644
index 3b6a214..0000000
--- a/pacemaker-1.1.11+git20140415.f7859e2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78e6d134ff2750aaa91bb4551add0344f094bea8a5c738bd562dca21663e1cff
-size 9422160
diff --git a/pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2 b/pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2
new file mode 100644
index 0000000..38c46f5
--- /dev/null
+++ b/pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4cc85b40e123df2acd689817d0157e3016e51aa6506bf921e53fdab86c624c3
+size 9384593
diff --git a/pacemaker-NodeUtilization-RA.patch b/pacemaker-NodeUtilization-RA.patch
index dcd33c6..2395d35 100644
--- a/pacemaker-NodeUtilization-RA.patch
+++ b/pacemaker-NodeUtilization-RA.patch
@@ -17,7 +17,7 @@ Index: pacemaker/extra/resources/Makefile.am
 +			NodeUtilization
  
  if BUILD_XML_HELP
- man7_MANS = $(ocf_SCRIPTS:%=ocf_pacemaker_%.7)
+
 Index: pacemaker/extra/resources/NodeUtilization
 ===================================================================
 --- /dev/null
diff --git a/pacemaker-colocated-utilization.patch b/pacemaker-colocated-utilization.patch
index fb38b38..b6a42f7 100644
--- a/pacemaker-colocated-utilization.patch
+++ b/pacemaker-colocated-utilization.patch
@@ -85,9 +85,9 @@ Index: pacemaker/pengine/native.c
  };
  
 @@ -95,27 +95,119 @@ check_capacity(gpointer key, gpointer va
-     remaining = crm_parse_int(g_hash_table_lookup(data->node->details->utilization, key), "0");
- 
-     if (required > remaining) {
+         CRM_ASSERT(data->rsc);
+         CRM_ASSERT(data->node);
+
 -        pe_rsc_debug(data->rsc,
 -                     "Node %s has no enough %s for resource %s: required=%d remaining=%d",
 -                     data->node->details->uname, (char *)key, data->rsc->id, required, remaining);
@@ -308,9 +308,9 @@ Index: pacemaker/pengine/native.c
          struct node_shared_s *details_lh;
          struct node_shared_s *details_rh;
 @@ -1550,7 +1690,7 @@ native_rsc_colocation_rh(resource_t * rs
- {
-     enum filter_colocation_res filter_results;
  
+     CRM_ASSERT(rsc_lh);
+     CRM_ASSERT(rsc_rh);
 -    filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint);
 +    filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE);
  
diff --git a/pacemaker.changes b/pacemaker.changes
index c6ff69e..4f11a1d 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon May  5 07:42:25 UTC 2014 - ygao@suse.com
+
+- Rebase:
+  * pacemaker-NodeUtilization-RA.patch
+  * pacemaker-colocated-utilization.patch
+
+- xml: Clean up schema list at exit
+- pengine: Support cluster-specific instance attributes based on rules (FATE#316118)
+- crmd: Ensure crm_config options are re-read on updates
+- Resolve all clang analyser defects
+- xml: Check all available schemas when doing upgrades
+- Changes to the ACL schema to support nodes and unix groups
+- tools: Allow crm_shadow to create older configuration versions
+- xml: Prevent use-after-free when comparing two xml documents
+- cib: Resolve memory leaks in query paths
+- xml: Correctly subtract xml with v1 patchsets
+- fencing: Advertise support for reboot/on/off in the metadata for legacy agents
+- fencing: default to 'off' when agent does not advertise 'reboot' in metadata
+- fencing: Execute all required fencing devices regardless of what topology level they are at
+- fencing: Fence using all required devices
+- fencing: fixed so that change of <resources> could be handled correctly.
+- Upstream version cs: 42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370
+
 -------------------------------------------------------------------
 Wed Apr 16 06:38:45 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 2f4ab80..f0d2276 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -95,7 +95,7 @@ Name:           pacemaker
 Summary:        Scalable High-Availability cluster resource manager
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Clustering/HA
-Version:        1.1.11+git20140415.f7859e2
+Version:        1.1.11+git20140505.42ae0e3
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org