diff --git a/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch b/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch
new file mode 100644
index 0000000..5f00488
--- /dev/null
+++ b/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch
@@ -0,0 +1,12 @@
+diff -ur dracut-044.orig/modules.d/95zfcp_rules/parse-zfcp.sh dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh
+--- dracut-044.orig/modules.d/95zfcp_rules/parse-zfcp.sh	2018-12-21 11:52:21.457034071 +0100
++++ dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh	2018-12-21 11:56:19.179414976 +0100
+@@ -22,8 +22,6 @@
+         return 0;
+     fi
+ 
+-    [ -e ${_rule} ] && return 0
+-
+     if [ ! -f "$_rule" ] ; then
+         cat > $_rule <<EOF
+ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw %k ${ccw} zfcp"
diff --git a/dracut.changes b/dracut.changes
index f9b4644..26878a8 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 21 11:02:32 UTC 2018 - Michal Suchanek <msuchanek@suse.com>
+
+- 95zfcp_rules/parse-zfcp.sh: remove rule existence check (bsc#1008352).
+  * adds 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch
+
 -------------------------------------------------------------------
 Wed Oct 31 09:57:55 UTC 2018 - Daniel Molkentin <daniel.molkentin@suse.com>
 
diff --git a/dracut.spec b/dracut.spec
index 8bd205d..e0dcc00 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -117,6 +117,8 @@ Patch161:       0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch
 Patch188:       0188-95dasd_rules-Install-collect-udev-helper-binary.patch
 # TODO: Apply upstream (??)
 Patch506:       0506-Boot-on-s390x-with-fips-1-on-the-kernel-commnad-line.patch
+# TODO: Upstream ?
+Patch585:       0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch
 
 #FIPS
 Patch53:        0053-01fips-fixup-loading-issues.patch
@@ -715,6 +717,7 @@ chmod a+x modules.d/95qeth_rules/module-setup.sh
 %patch582 -p1
 %patch583 -p1
 %patch584 -p1
+%patch585 -p1
 
 %build
 %configure\