diff --git a/templates/udev-devel b/templates/udev-devel
new file mode 120000
index 0000000000..b95ad750c4
--- /dev/null
+++ b/templates/udev-devel
@@ -0,0 +1 @@
+udev
\ No newline at end of file
diff --git a/templates/udev/arch-udev-rules.diff b/templates/udev/arch-udev-rules.diff
deleted file mode 100644
index d1f7768f67..0000000000
--- a/templates/udev/arch-udev-rules.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- rules/rules.d/50-udev-default.rules	2009-03-07 22:22:48.200242883 +0100
-+++ rules/rules.d.arch/50-udev-default.rules	2009-03-07 22:23:26.134434516 +0100
-@@ -64,20 +64,20 @@
- 
- # floppy
- KERNEL=="fd[0-9]", GROUP="floppy"
--KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
--KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-+KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
-+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
- 
- # cdrom
--SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
--SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
--SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
--KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
--KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660"
-+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="optical", MODE="0660"
-+SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
-+KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="optical", MODE="0660"
-+KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="optical", MODE="0660"
- 
- # tape
--KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
--KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
--SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
-+KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="storage", MODE="0660"
-+KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660"
-+SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
- 
- # block-releated
- KERNEL=="sch[0-9]*", GROUP="disk"
-@@ -116,5 +116,4 @@
- KERNEL=="cpad[0-9]*",		NAME="usb/%k"
- 
- # do not delete static device nodes
--ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
--ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
-+ACTION=="remove", PROGRAM="ignore-remove.sh %r", OPTIONS+="ignore_remove"
---- rules/rules.d/60-persistent-storage.rules	2009-03-07 22:22:48.200242883 +0100
-+++ rules/rules.d.arch/60-persistent-storage.rules	2009-03-07 22:22:54.757744454 +0100
-@@ -10,7 +10,7 @@
- SUBSYSTEM!="block", GOTO="persistent_storage_end"
- 
- # skip rules for inappropriate block devices
--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", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end"
diff --git a/templates/udev/devel.template b/templates/udev/devel.template
new file mode 100644
index 0000000000..36750d3c20
--- /dev/null
+++ b/templates/udev/devel.template
@@ -0,0 +1,19 @@
+# Template file for 'udev-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run udev
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/share ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/pkgconfig/* ${DESTDIR}/usr/lib/pkgconfig
+	rm -rf ${SRCPKGDESTDIR}/usr/share/pkgconfig
+}
diff --git a/templates/udev/files/ignore-remove.sh b/templates/udev/files/ignore-remove.sh
deleted file mode 100644
index be9bf664b3..0000000000
--- a/templates/udev/files/ignore-remove.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
-  exit 1
-fi
-
-for f in ${DEVNAME} ${DEVLINKS}; do
-  if [ -e "/lib/udev/devices/${f#$1}" ]; then
-    exit 0
-  fi
-done
-
-exit 1
diff --git a/templates/udev/template b/templates/udev/template
index 40ba1db70b..e4afe42829 100644
--- a/templates/udev/template
+++ b/templates/udev/template
@@ -1,21 +1,31 @@
 # Template file for 'udev'
 pkgname=udev
-version=142
-patch_files="arch-udev-rules.diff"
+sourcepkg=$pkgname
+version=143
 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2"
 build_style=gnu_configure
-configure_args="--exec-prefix= --without-selinux"
+configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev
+ --with-rootlibdir=/lib"
 short_desc="A userspace implementation of devfs"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=59c819d4717bc4940a5372c027ebf569e992949778ec1b20a12a0e3b3d4d165b
+checksum=3406a653533d573baa50bbdcd81a314377ae9506c9d4573aae7ae2e0755d9439
 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."
 
 openrc_services="udev sysinit"
+conf_files="/etc/udev/udev.conf"
+subpackages="devel"
+
 Add_dependency full glibc
 Add_dependency full procps
 Add_dependency full libblkid
+Add_dependency full glib
+Add_dependency full acl
+Add_dependency full libusb-compat
+Add_dependency full usbutils 0.82
+Add_dependency full pciutils
+Add_dependency build gperf
 
 post_install()
 {
@@ -26,7 +36,6 @@ post_install()
 	for f in ia64 ppc s390; do
 		rm ${DESTDIR}/lib/udev/rules.d/40-${f}.rules
 	done
-	install -m755 ${FILESDIR}/ignore-remove.sh ${DESTDIR}/lib/udev
 
 	# Create some devices that are needed by the initramfs.
 	install -d $DESTDIR/lib/firmware