diff --git a/biosdevname.changes b/biosdevname.changes
index 9302093..a32a500 100644
--- a/biosdevname.changes
+++ b/biosdevname.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 10 17:14:24 UTC 2014 - trenn@suse.de
+
+- Remove eth* check, devices might have been renamed already bnc#869614
+  Add biosdevname_udevrule_rename_all_network_devices.patch
+- Remove old mkinitrd stuff and replace it with dracut rpm macros to ensure
+  the initrd is rebuild if biosdevname got installed or updated.
+
 -------------------------------------------------------------------
 Tue Mar 25 13:42:43 UTC 2014 - trenn@suse.de
 
diff --git a/biosdevname.spec b/biosdevname.spec
index 5c653f8..809a0b5 100644
--- a/biosdevname.spec
+++ b/biosdevname.spec
@@ -29,13 +29,13 @@ Url:            http://linux.dell.com/files/biosdevname/
 # breadth-first, or of so, there haven't been any comments about that
 # on LKML.
 ExclusiveArch:  %{ix86} x86_64
-#Source0:        http://linux.dell.com/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        setup-biosdevname.sh
 Patch1:         biosdevname_v0.5.0_to_git_c140ce659a204d67e4cc.patch
 Patch2:         ignore-broken-BIOSes
 Patch3:         whitelist-dell
 Patch4:         udev-rule-path.patch
+Patch5:         biosdevname_udevrule_rename_all_network_devices.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  pciutils-devel
@@ -66,6 +66,7 @@ You can enable/disable usage of biosdevname with boot option
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # this is a udev rule, so it needs to live in / rather than /usr
@@ -95,10 +96,10 @@ perl -pi -e 's,^# GOTO,GOTO,g;' \
 
 %post
 /sbin/ldconfig
-mkinitrd_setup
+%{?regenerate_initrd_post}
 
 %postun
 /sbin/ldconfig
-mkinitrd_setup
+%{?regenerate_initrd_posttrans}
 
 %changelog
diff --git a/biosdevname_udevrule_rename_all_network_devices.patch b/biosdevname_udevrule_rename_all_network_devices.patch
new file mode 100644
index 0000000..0d360b1
--- /dev/null
+++ b/biosdevname_udevrule_rename_all_network_devices.patch
@@ -0,0 +1,17 @@
+biosdevname: Rename all network devices, not only eth* ones
+
+There are other rules which might have renamed the device already.
+bnc#869614
+
+Signed-off-by: Thomas Renninger <trenn@suse.de>
+
+Index: biosdevname-0.5.0/biosdevname.rules.in
+===================================================================
+--- biosdevname-0.5.0.orig/biosdevname.rules.in
++++ biosdevname-0.5.0/biosdevname.rules.in
+@@ -1,5 +1,4 @@
+ SUBSYSTEM!="net", GOTO="netdevicename_end"
+-KERNEL!="eth*",   GOTO="netdevicename_end"
+ ACTION!="add",    GOTO="netdevicename_end"
+ NAME=="?*",       GOTO="netdevicename_end"
+