diff --git a/HEAD~2:media-gfx/shotwell/shotwell-0.5.0.ebuild b/HEAD:media-gfx/shotwell/shotwell-0.5.0-r1.ebuild
index 33937d0..c90ef7a 100644
--- a/HEAD~2:media-gfx/shotwell/shotwell-0.5.0.ebuild
+++ b/HEAD:media-gfx/shotwell/shotwell-0.5.0-r1.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI="2"
+GCONF_DEBUG="no"
 
-inherit fdo-mime gnome2-utils versionator
+inherit gnome2 versionator
 
 MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Open source photo manager for GNOME"
@@ -16,33 +17,32 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/dbus-glib-0.80
-	gnome-base/gconf
+RDEPEND=">=dev-db/sqlite-3.5.9:3
+	>=dev-libs/dbus-glib-0.80
 	>=dev-libs/libgee-0.5.0
-	>=x11-libs/gtk+-2.14.4:2
-	media-libs/libexif
-	media-libs/libgphoto2
+	>=dev-libs/libunique-1.0.0
+	>=dev-libs/libxml2-2.6.32
+	>=gnome-base/gconf-2.22.0
+	>=media-libs/libexif-0.6.16
+	>=media-libs/libgphoto2-2.4.2
 	>=net-libs/libsoup-2.26.0
-	dev-libs/libxml2
-	dev-db/sqlite:3
-	dev-libs/libunique
-	>=dev-lang/vala-0.7.10
-	>=net-libs/webkit-gtk-1.1.5"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" \
-		DISABLE_DESKTOP_UPDATE="1" DISABLE_SCHEMAS_INSTALL="1" \
-		DISABLE_ICON_UPDATE="1" \
-		install || die "emake install failed"
+	>=net-libs/webkit-gtk-1.1.5
+	>=sys-fs/udev-145[extras]
+	>=x11-libs/gtk+-2.14.4:2"
+DEPEND="${RDEPEND}
+	=dev-lang/vala-0.7*"
+
+DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
+
+pkg_setup() {
+	G2CONF="--disable-schemas-install \
+		--disable-desktop-update \
+		--disable-icon-update"
 }
 
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+src_install() {
+	# This is needed so that gnome2_gconf_savelist() works correctly.
+	insinto "${EPREFIX}"/etc/gconf/schemas
+	doins misc/shotwell.schemas || die "install gconf schema failed"
+	gnome2_src_install
 }