diff --git a/PKGBUILD b/PKGBUILD
index 30924af..0c75129 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: artoo <artoo@manjaro.org>
+# Maintainer: fbt <fbt@fleshless.org>
+# Contributor: artoo <artoo@manjaro.org>
 # Contributor: Alexey D. <lq07829icatm@rambler.ru>
 # Contributor: Ivailo Monev <xakepa10@gmail.com>
 
@@ -7,7 +8,7 @@ _src_uri='http://dev.gentoo.org/~blueness/eudev'
 
 pkgname=( 'eudev' 'libeudev' )
 pkgver=3.1.2
-pkgrel=2
+pkgrel=4
 pkgdesc="The userspace dev tools (udev) forked by Gentoo"
 arch=('i686' 'x86_64')
 url="http://www.gentoo.org/proj/en/eudev/"
@@ -28,7 +29,7 @@ build() {
 		--libdir=/usr/lib \
 		--sbindir=/usr/bin \
 		--with-html-dir=/usr/share/doc/${pkgname}-${pkgver}/html \
-		--enable-gudev \
+		--disable-gudev \
 		--enable-introspection \
 		--enable-kmod \
 		--enable-split-usr
@@ -71,16 +72,13 @@ package_eudev() {
 	cd "${srcdir}/_libeudev"
 
 	# ...libs
-	mkdir -pm755 usr/lib
-	mv "$pkgdir"/usr/lib/lib{g,}udev*.{so,a}* usr/lib
-
-	# ...pkgconfig
-	mkdir -pm755 usr/lib/pkgconfig
-	mv "$pkgdir"/usr/lib/pkgconfig/{libudev,gudev-1.0}.pc usr/lib/pkgconfig
+	mkdir -pm755 usr/lib usr/lib/pkgconfig
+	mv "$pkgdir"/usr/lib/libudev*.{so,a}* usr/lib/
+	mv "$pkgdir"/usr/lib/pkgconfig/libudev.pc usr/lib/pkgconfig/libudev.pc
 
 	# ...headers
 	mkdir -pm755 usr/include
-	mv "$pkgdir"/usr/include/{gudev-1.0,libudev.h} usr/include
+	mv "$pkgdir"/usr/include/libudev.h usr/include
 }
 
 package_libeudev() {
@@ -88,12 +86,10 @@ package_libeudev() {
 	depends=( 'glibc' 'glib2' )
 	provides=(
 		"libudev=${_udevver}"
-		'libgudev-1.0.so'
 		'libudev.so'
 	)
 	conflicts=(
 		'libeudev>=1.8'
-		'libgudev-1.0.so'
 		'libudev.so'
 	)