diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
deleted file mode 100644
index 4e9b5567..00000000
--- a/xfce-base/thunar/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD thunar-9999.ebuild 1929 SHA256 d0c3a89b435010c99123249d9585de9fa7fd8927736d8e97f246c0da34c3d943 SHA512 e830ab0b775556de4b886aa2aa232feb1174dfdf74181d9f1affd6864c29e89a14f36057e8e5fa14e5cee07729160b9de22e34b1eaa1c9688d3a9363042d7561 WHIRLPOOL 00b0947f8c941d36883dba27801785d2d05761e6d05a7675aa00659d70ae8603bb8135fda53ab29433de7d245d14aff108a725b35f38cc36498e4a9a55c47dff
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlMxw1gACgkQmWq1bYTyC0PbOgEAuRKkPwUW4vgEK+vQeJtZnu9R
-00Td0vO0vCwMWMGiecMBAJ0vx2In5R1lUYyNdE6QHEl0LSeHUrUNIC48zPTKgnTM
-=ZtyM
------END PGP SIGNATURE-----
diff --git a/xfce-base/thunar/thunar-9999.ebuild b/xfce-base/thunar/thunar-9999.ebuild
index db8f1dc0..820191f3 100644
--- a/xfce-base/thunar/thunar-9999.ebuild
+++ b/xfce-base/thunar/thunar-9999.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="http://www.xfce.org/projects/ http://thunar.xfce.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
+IUSE="+dbus debug exif libnotify pcre startup-notification test udisks +xfce_plugins_trash"
 
-GVFS_DEPEND=">=gnome-base/gvfs-1.10.1"
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
 COMMON_DEPEND=">=dev-lang/perl-5.6
 	>=dev-libs/glib-2.30
 	>=x11-libs/gdk-pixbuf-2.14
@@ -29,13 +29,16 @@ COMMON_DEPEND=">=dev-lang/perl-5.6
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	udev? ( virtual/udev[gudev] )
+	udisks? ( virtual/libgudev:= )
 	xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10 )"
 RDEPEND="${COMMON_DEPEND}
 	>=dev-util/desktop-file-utils-0.20-r1
 	x11-misc/shared-mime-info
 	dbus? ( ${GVFS_DEPEND} )
-	udev? ( || ( ${GVFS_DEPEND}[udisks,udev] ${GVFS_DEPEND}[gdu,udev] ) )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)
 	xfce_plugins_trash? ( ${GVFS_DEPEND} )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool