diff --git a/_service b/_service
index 01ec0a9..4227230 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">6442c5a67cdd4cbaeedb2c532e0dc0667a79c202</param>
+    <param name="revision">ff74a591e670dbdb86f7cddeec989167de521216</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/bug-812269_pacemaker-fencing-device-register-messages.patch b/bug-812269_pacemaker-fencing-device-register-messages.patch
index b7b4aef..9485d93 100644
--- a/bug-812269_pacemaker-fencing-device-register-messages.patch
+++ b/bug-812269_pacemaker-fencing-device-register-messages.patch
@@ -8,15 +8,6 @@ Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c
 ===================================================================
 --- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/commands.c
 +++ pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c
-@@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c
- 
-     dup = device_has_duplicate(device);
-     if (dup) {
--        crm_notice("Device '%s' already existed in device list (%d active devices)", device->id,
-+        crm_info("Device '%s' already existed in device list (%d active devices)", device->id,
-                    g_hash_table_size(device_list));
-         free_device(device);
-         device = dup;
 @@ -840,7 +840,7 @@ stonith_device_register(xmlNode * msg, c
          }
          g_hash_table_replace(device_list, device->id, device);
diff --git a/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 b/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2
deleted file mode 100644
index 330ce04..0000000
--- a/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5e3e3b0ec854e1b571bebe4f22a6628357ebb0894299055815ac4f5b34ffbb0
-size 9428490
diff --git a/pacemaker-1.1.11+git20140411.ff74a59.tar.bz2 b/pacemaker-1.1.11+git20140411.ff74a59.tar.bz2
new file mode 100644
index 0000000..c8fca90
--- /dev/null
+++ b/pacemaker-1.1.11+git20140411.ff74a59.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8644df891782d96e2b6f3c98b20f0a4d9737a299fc76699c6c3dc069786dd15
+size 9431203
diff --git a/pacemaker.changes b/pacemaker.changes
index f9f8922..a60fe35 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Fri Apr 11 15:07:26 UTC 2014 - ygao@suse.com
+
+- Rebase:
+  * bug-812269_pacemaker-fencing-device-register-messages.patch
+
+- Build: Update versions in configure.ac and sample spec file
+- fencing: Do not unregister/register all stonith devices on every resource agent change
+- PE: Unfencing is based on device probes, there is no need to unfence when normal resources are found active
+- pengine: handles edge case where container order constraints are not honored during migration
+- pengine: Allow container nodes to migrate with connection resource
+- xml: Resolve memory leak when logging xml blobs
+- PE: Do not unfence nodes that are offline, unclean or shutting down
+- PE: Ensure unfencing only happens once, even if the transition is interrupted
+- crmd: Actions can only be executed if their pre-requisits completed successfully
+- crmd: Do not erase the status section for unfenced nodes
+- Fencing: Correctly record which peer performed the fencing operation
+- lrmd: Expose logging variables expected by OCF agents
+- logging: Simplify processing of logging directives
+- logging: daemons always get a log file, unless explicitly set to configured 'none'
+- PE: Ensure unfencing occurs before fencing devices are (re-)probed
+- fencing: Filter self-fencing at the peers to allow unfencing to work correctly
+- fencing: Automatically switch from 'list' to 'status' to 'static-list' if those actions are not advertised in the metadata
+- lrmd: Provide stderr output from agents if available, otherwise fall back to stdout
+- fencing: properly detect new fencing devices for v2 cib updates
+- acl: Prevent use-of-NULL
+- cts: automatically determine whether to run RemoteBaremetal (bnc#856353)
+- pengine: Correctly search failcount
+- Upstream version cs: ff74a591e670dbdb86f7cddeec989167de521216
+
 -------------------------------------------------------------------
 Wed Apr  9 04:41:38 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 2dee292..92aec0c 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+git20140409.6442c5a
+Version:        1.1.11+git20140411.ff74a59
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org