diff --git a/0012-mark-corosync-as-a-static-service.patch b/0012-mark-corosync-as-a-static-service.patch
new file mode 100644
index 0000000..842fc9e
--- /dev/null
+++ b/0012-mark-corosync-as-a-static-service.patch
@@ -0,0 +1,8 @@
+--- corosync-2.4.2.orig/init/corosync.service.in	2017-08-29 15:47:18.131052520 +0800
++++ corosync-2.4.2/init/corosync.service.in	2017-08-29 15:46:24.949842298 +0800
+@@ -23,4 +23,4 @@
+ #ExecStartPre=/sbin/modprobe softdog soft_margin=60
+ 
+ [Install]
+-WantedBy=multi-user.target
++#WantedBy=multi-user.target
diff --git a/corosync.changes b/corosync.changes
index 8e75b22..8e233f4 100644
--- a/corosync.changes
+++ b/corosync.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 29 07:50:16 UTC 2017 - bliu@suse.com
+
+- corosync.service should be marked as a static service(bsc#1055585)
+    Added: 0012-mark-corosync-as-a-static-service.patch
+
 -------------------------------------------------------------------
 Tue Aug  8 08:17:27 UTC 2017 - jengelh@inai.de
 
@@ -19,6 +25,7 @@ Thu Aug  3 02:49:21 UTC 2017 - bliu@suse.com
    Modified:corosync.spec
    1) as in openSUSE:factory, there are %define, but bcond_with coudld be toggled by osc command , change %define to %bcond_with and %bcond_without
    2) change service_del_postun to service_del_preun, since service_del_postun is not a right macro
+   3) remove macro tpmfiles_create define from corosync.spec.
  
 
 -------------------------------------------------------------------
diff --git a/corosync.spec b/corosync.spec
index 33dffc0..c50e6ec 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -32,10 +32,6 @@
 %bcond_without qdevices
 %bcond_without qnetd
 
-%if !%{defined tmpfiles_create}
-%define tmpfiles_create systemd-tmpfiles --create ||:
-%endif
-
 %if 0%{?sles_version} == 12
 %ifnarch s390 s390x
 %define buildib 1
@@ -75,6 +71,7 @@ Patch18:        0008-main.c-add-option-to-set-priority.patch
 Patch19:        0009-totem-Propagate-totem-initialization-failure.patch
 Patch20:        0010-fix-ifdown-udp.patch
 Patch21:        0011-fix-tmpfiles-create.patch
+Patch22:        0012-mark-corosync-as-a-static-service.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -154,6 +151,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 %if %{with runautogen}