diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 4edecab506f0e..b52c4d274bcf4 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -20,11 +20,12 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy vkontakte wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
 	udisks? ( dbus )
+	udisks_legacy? ( dbus )
 	wiimote? ( dbus )
 "
 
@@ -41,7 +42,6 @@ COMMON_DEPEND="
 	>=media-libs/chromaprint-0.6
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	media-libs/libechonest:=[qt4]
 	>=media-libs/libmygpo-qt-1.0.8
 	>=media-libs/taglib-1.8[mp4]
 	sys-libs/zlib
@@ -65,7 +65,8 @@ COMMON_DEPEND="
 # 06-fix-numeric-locale.patch
 # 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:2 ) )
+	dbus? ( udisks? ( sys-fs/udisks:2 )
+	        udisks_legacy? ( sys-fs/udisks:0 ) )
 	mms? ( media-plugins/gst-plugins-libmms:1.0 )
 	mtp? ( gnome-base/gvfs )
 	media-plugins/gst-plugins-meta:1.0
@@ -78,10 +79,10 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	dev-qt/qttest:4
 	dev-cpp/gmock
-	amazoncloud? ( dev-cpp/sparsehash )
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
+	seafile? ( dev-cpp/sparsehash )
 	pulseaudio? ( media-sound/pulseaudio )
 	skydrive? ( dev-cpp/sparsehash )
 	test? ( gnome-base/gsettings-desktop-schemas )
@@ -118,7 +119,8 @@ src_configure() {
 		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_DEVICEKIT="$(usex udisks)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_DEVICEKIT="$(usex udisks_legacy)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBLASTFM="$(usex lastfm)"
 		-DENABLE_LIBMTP="$(usex mtp)"
@@ -130,6 +132,7 @@ src_configure() {
 		-DENABLE_DROPBOX="$(usex dropbox)"
 		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_SEAFILE="$(usex seafile)"
 		-DENABLE_SKYDRIVE="$(usex skydrive)"
 		-DENABLE_VK="$(usex vkontakte)"
 		-DENABLE_SPOTIFY_BLOB=OFF
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 64bd4a153f6a3..dc6050b232060 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -21,9 +21,11 @@
 		<flag name="lastfm">Use liblastfm for fetching song info, scrobbling and radio streams</flag>
 		<flag name="moodbar">Enable moodbar support</flag>
 		<flag name="projectm">Build with ProjectM visualization</flag>
+		<flag name="seafile">Enable support for seafile: a file sync service</flag>
 		<flag name="skydrive">Enable Skydrive support</flag>
 		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation</flag>
 		<flag name="ubuntu-one">Enable Ubuntu One support</flag>
+		<flag name="udisks_legacy">Enable storage management support via legacy <pkg>sys-fs/udisks</pkg>:0</flag>
 		<flag name="vkontakte">Enable vk.com support</flag>
 		<flag name="wiimote">Enable support for Wii remote</flag>
 	</use>