diff --git a/srcpkgs/udev/files/udev.initramfs-inittop b/srcpkgs/udev/files/udev.initramfs-inittop
index 2a54a3a1f3..733572151c 100644
--- a/srcpkgs/udev/files/udev.initramfs-inittop
+++ b/srcpkgs/udev/files/udev.initramfs-inittop
@@ -17,19 +17,12 @@ case "$1" in
 esac
 
 
-# It's all over netlink now
-echo > /sys/kernel/uevent_helper
-
 # Start the udev daemon to process events
 udevd --daemon --resolve-names=never
 
 # Iterate sysfs and fire off everything; if we include a rule for it then
 # it'll get handled; otherwise it'll get handled later when we do this again
 # in the main boot sequence.
-udevadm trigger --action=add
-udevadm settle || true
-
-if [ -d /sys/bus/scsi ]; then
-	modprobe -q scsi_wait_scan && modprobe -r scsi_wait_scan || true
-	udevadm settle || true
-fi
+udevadm trigger --action=add --type=subsystems
+udevadm trigger --action=add --type=devices
+udevadm settle
diff --git a/srcpkgs/udev/files/udev.rc b/srcpkgs/udev/files/udev.rc
index 51bd572f49..73c94d2042 100644
--- a/srcpkgs/udev/files/udev.rc
+++ b/srcpkgs/udev/files/udev.rc
@@ -16,8 +16,6 @@ depend()
 
 start()
 {
-	echo > /proc/sys/kernel/hotplug
-
 	[ ! -d /run/udev ] && mkdir -p /run/udev
 
 	ebegin "Starting udev and waiting for uevents"
diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template
index b006f6eb84..77f9d51a77 100644
--- a/srcpkgs/udev/template
+++ b/srcpkgs/udev/template
@@ -1,6 +1,7 @@
 # Template file for 'udev'
 pkgname=udev
 version=171
+revision=1
 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2"
 build_style=gnu_configure
 configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev
@@ -9,7 +10,7 @@ configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev
 short_desc="/dev/ and hotplug management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license="GPL"
+license="GPL-2"
 checksum=fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e
 long_desc="
  udev is a daemon which dynamically creates and removes device nodes from