diff --git a/templates/udev-glib-devel b/templates/udev-glib-devel
new file mode 120000
index 00000000000..b95ad750c43
--- /dev/null
+++ b/templates/udev-glib-devel
@@ -0,0 +1 @@
+udev
\ No newline at end of file
diff --git a/templates/udev/devel.template b/templates/udev/devel.template
index 36750d3c200..9ae4c73769d 100644
--- a/templates/udev/devel.template
+++ b/templates/udev/devel.template
@@ -9,11 +9,14 @@ 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
+	mkdir -p ${DESTDIR}/usr/share/gtk-doc/html \
+		${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
+	mv ${SRCPKGDESTDIR}/usr/include/*.h ${DESTDIR}/usr/include
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/libudev \
+		${DESTDIR}/usr/share/gtk-doc/html
 	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
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/udev.pc \
+		${DESTDIR}/usr/lib/pkgconfig
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/libudev.pc \
+		${DESTDIR}/usr/lib/pkgconfig
 }
diff --git a/templates/udev/glib-devel.template b/templates/udev/glib-devel.template
new file mode 100644
index 00000000000..ffc393d8b3c
--- /dev/null
+++ b/templates/udev/glib-devel.template
@@ -0,0 +1,22 @@
+# Template file for 'udev-glib-devel'.
+#
+short_desc="${short_desc} (development glib bindings)"
+long_desc="${long_desc}
+
+ This package contains the libgudev development files (static libs, headers,
+ etc), a library to interact with udev through the GLib bindings."
+
+Add_dependency run udev-glib
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/gtk-doc/html \
+		${DESTDIR}/usr/lib/pkgconfig
+	mv ${SRCPKGDESTDIR}/usr/include/gudev* ${DESTDIR}/usr/include
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/gudev \
+		${DESTDIR}/usr/share/gtk-doc/html
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/gudev* \
+		${DESTDIR}/usr/lib/pkgconfig
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
+}
diff --git a/templates/udev/template b/templates/udev/template
index fe8273bcfdb..ab0eb4f7ca4 100644
--- a/templates/udev/template
+++ b/templates/udev/template
@@ -1,21 +1,20 @@
 # Template file for 'udev'
 pkgname=udev
-version=146
-revision=2
+version=147
 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2"
 build_style=gnu_configure
 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=6c20e1980d62638e139da04c0d591bf9a96ae279a755f9dd40fb0eea918a0fa5
+checksum=6517acde28bf319fc52c2b65fef7ef9f35a62bd669bbda6ad65de354d74d8d6b
 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 glib"
+subpackages="devel glib glib-devel"
 
 Add_dependency full glibc
 Add_dependency full procps
@@ -25,6 +24,7 @@ Add_dependency full usbutils	">=0.82"
 Add_dependency full pciutils
 Add_dependency build glib
 Add_dependency build gperf
+Add_dependency build gobject-introspection
 
 post_install()
 {
@@ -48,4 +48,13 @@ post_install()
 		$DESTDIR/usr/share/initramfs-tools/scripts/init-premount/udev
 	install -m 755 ${FILESDIR}/udev.initramfs-bottom \
 		$DESTDIR/usr/share/initramfs-tools/scripts/init-bottom/udev
+
+	# Move gobject introspection stuff to correct path
+	mv $DESTDIR//lib/girepository* $DESTDIR/usr/lib
+
+	# Move pkgconfig files to correct path
+	install -d $DESTDIR/usr/lib/pkgconfig
+	mv $DESTDIR/lib/pkgconfig/* $DESTDIR/usr/lib/pkgconfig
+	mv $DESTDIR/usr/share/pkgconfig/* $DESTDIR/usr/lib/pkgconfig
+	rmdir $DESTDIR/usr/share/pkgconfig
 }