diff --git a/auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch b/auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
new file mode 100644
index 0000000..edf0edf
--- /dev/null
+++ b/auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
@@ -0,0 +1,13 @@
+Index: ocfs2-tools-1.8.4/libo2cb/o2cb_abi.c
+===================================================================
+--- a/libo2cb/o2cb_abi.c
++++ b/libo2cb/o2cb_abi.c
+@@ -200,7 +200,7 @@ redo:
+ }
+ } else if (len == -ENOENT) {
+ if (!setup_performed) {
+- o2cb_setup_stack(OCFS2_CLASSIC_CLUSTER_STACK);
++ o2cb_setup_stack(OCFS2_PCMK_CLUSTER_STACK);
+ setup_performed = 1;
+ goto redo;
+ }
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 69112ca..e7fa6f6 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 22 03:23:50 UTC 2015 - zren@suse.com
+
+- Make pcmk as default stack for ocfs2, and this patch may go along
+ with us forever
+ +auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
+
-------------------------------------------------------------------
Tue Sep 8 02:58:55 UTC 2015 - zren@suse.com
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index e862cfa..7bc7835 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -26,6 +26,7 @@ Url: https://ocfs2.wiki.kernel.org/
Source: ocfs2-tools-%{version}.tar.gz
Source1: o2cb.ocf
Source2: reflink.tar.bz2
+Patch001: auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
Patch103: debug-ocfs2_hb_ctl.patch
Patch105: bug-470741-debug_start_failures.patch
Patch106: ocfs2-devel.diff
@@ -137,6 +138,7 @@ OCFS2 filesystem.
%prep
%setup -q -a 2
+%patch001 -p1
%patch103 -p1
%patch105 -p1
%patch106 -p1