diff --git a/templates/klibc-udev/template b/templates/klibc-udev/template
index 5efd2dc00e3..c1ae31b1ecf 100644
--- a/templates/klibc-udev/template
+++ b/templates/klibc-udev/template
@@ -1,13 +1,13 @@
 # Template file for 'klibc-udev'
 pkgname=klibc-udev
-version=139
+version=141
 wrksrc="udev-${version}"
 distfiles="
 http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$version.tar.bz2"
 build_style=custom-install
 short_desc="A Userspace implementation of devfs (for initramfs)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6786a896146b12323d0ef31601dc23b6e5501762d7d61c475d09e405494c21df
+checksum=51e0128c3fc29971d978050839fd59f103fddae4a47c8fd2b36f2836cfb59d35
 long_desc="
  udev is a implementation of devfs in userspace using sysfs and
  /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly.
diff --git a/templates/udev/arch-udev-rules.diff b/templates/udev/arch-udev-rules.diff
index 1a1cb70a265..d1f7768f67c 100644
--- a/templates/udev/arch-udev-rules.diff
+++ b/templates/udev/arch-udev-rules.diff
@@ -44,8 +44,8 @@
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
  
  # skip rules for inappropriate block devices
--KERNEL=="ram*|fd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
-+KERNEL=="ram*|fd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
+-KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end"
++KERNEL=="fd*|mtd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
  
  # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
- KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
+ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end"
diff --git a/templates/udev/template b/templates/udev/template
index 3001ef01d0b..50d5ac063b3 100644
--- a/templates/udev/template
+++ b/templates/udev/template
@@ -1,7 +1,6 @@
 # Template file for 'udev'
 pkgname=udev
-version=140
-revision=2
+version=141
 patch_files="arch-udev-rules.diff"
 distfiles="
 http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-${version}.tar.bz2"
@@ -9,7 +8,7 @@ build_style=gnu_configure
 configure_args="--exec-prefix= --without-selinux"
 short_desc="A userspace implementation of devfs"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=869e015257457c58209d5aaae0c0f1f41d124c53601bb74e4dbb637442ea5b33
+checksum=51e0128c3fc29971d978050839fd59f103fddae4a47c8fd2b36f2836cfb59d35
 long_desc="
  udev is a implementation of devfs in userspace using sysfs and
  /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly."