diff --git a/1040-re-enable-dev_id-conditionally-in-persistent-rules.patch b/1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
new file mode 100644
index 0000000..e203d8d
--- /dev/null
+++ b/1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
@@ -0,0 +1,16 @@
+Index: systemd-210/src/udev/rule_generator/75-persistent-net-generator.rules
+===================================================================
+--- systemd-210.orig/src/udev/rule_generator/75-persistent-net-generator.rules
++++ systemd-210/src/udev/rule_generator/75-persistent-net-generator.rules
+@@ -68,8 +68,9 @@ ENV{MATCHADDR}=="e2:0c:0f:*", GOTO="glob
+ ENV{MATCHADDR}=="00:16:3e:*", GOTO="globally_administered_whitelist"
+ 
+ # match interface dev_id
+-# disable due to bnc#882714
+-# ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}"
++# HACK: for s390x, if layer2 == 0, dont use dev_id
++ENV{LAYER2}="1", TEST=="device/layer2", ENV{LAYER2}="$attr{device/layer2}"
++ENV{LAYER2}!="0", ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}"
+ 
+ # do not use "locally administered" MAC address
+ ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}=""
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 229c997..21c28d2 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com
+
+- rules: re-enable dev_id conditionally in persistent rules
+  (bnc#884403 and bnc#882714).
+  Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch 
+
 -------------------------------------------------------------------
 Wed Jun 25 17:27:55 UTC 2014 - werner@suse.de
 
@@ -19,7 +26,7 @@ Wed Jun 25 17:06:07 UTC 2014 - werner@suse.de
 -------------------------------------------------------------------
 Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
 
-- Temporary disable patch 1022 (bnc#884271 and bnc#882714
+- Temporary disable patch 1022 (bnc#884271 and bnc#882714).
 
 -------------------------------------------------------------------
 Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
diff --git a/systemd-mini.spec b/systemd-mini.spec
index a04089d..c691d2b 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -682,6 +682,8 @@ Patch1037:      1037-udev-exclude-cd-dvd-from-block-device.patch
 Patch1038:      1038-udev-fix-invalid-free-in-enable_name_policy.patch
 # PATCH-FIX-UPSTREAM 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
 Patch1039:      1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
+# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
+Patch1040:      1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -1185,6 +1187,7 @@ cp %{SOURCE7} m4/
 %patch1039 -p0
 %endif
 %endif
+%patch1040 -p1
 
 # ensure generate files are removed
 rm -f units/emergency.service
diff --git a/systemd.changes b/systemd.changes
index 229c997..21c28d2 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com
+
+- rules: re-enable dev_id conditionally in persistent rules
+  (bnc#884403 and bnc#882714).
+  Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch 
+
 -------------------------------------------------------------------
 Wed Jun 25 17:27:55 UTC 2014 - werner@suse.de
 
@@ -19,7 +26,7 @@ Wed Jun 25 17:06:07 UTC 2014 - werner@suse.de
 -------------------------------------------------------------------
 Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
 
-- Temporary disable patch 1022 (bnc#884271 and bnc#882714
+- Temporary disable patch 1022 (bnc#884271 and bnc#882714).
 
 -------------------------------------------------------------------
 Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
diff --git a/systemd.spec b/systemd.spec
index 32db278..06dab00 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -677,6 +677,8 @@ Patch1037:      1037-udev-exclude-cd-dvd-from-block-device.patch
 Patch1038:      1038-udev-fix-invalid-free-in-enable_name_policy.patch
 # PATCH-FIX-UPSTREAM 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
 Patch1039:      1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
+# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
+Patch1040:      1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -1180,6 +1182,7 @@ cp %{SOURCE7} m4/
 %patch1039 -p0
 %endif
 %endif
+%patch1040 -p1
 
 # ensure generate files are removed
 rm -f units/emergency.service