diff --git a/srcpkgs/gnome-settings-daemon/depends b/srcpkgs/gnome-settings-daemon/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/gnome-settings-daemon/depends
+++ b/srcpkgs/gnome-settings-daemon/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
index fab5b4c96a7..3e8c03fb060 100644
--- a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
+++ b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
@@ -1,47 +1,45 @@
 # Template file for 'gnome-settings-daemon-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run automake
 Add_dependency run pkg-config
 Add_dependency run intltool
-Add_dependency run libxml2-devel
-Add_dependency run GConf-devel
-Add_dependency run gnome-desktop-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run libpng-devel
-Add_dependency run nspr-devel
-Add_dependency run polkit-devel
-Add_dependency run gtk+-devel
-Add_dependency run startup-notification-devel
-Add_dependency run atk-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
 Add_dependency run glib-devel
-Add_dependency run dbus-glib-devel
 Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libpng-devel
 Add_dependency run libSM-devel
 Add_dependency run libICE-devel
-Add_dependency run libXext-devel
 Add_dependency run libX11-devel
-Add_dependency run gstreamer-devel
-Add_dependency run gst-plugins-base-devel
-Add_dependency run libXxf86misc-devel
-Add_dependency run libnotify-devel
-Add_dependency run libgnomekbd-devel
-Add_dependency run libxklavier-devel
+Add_dependency run libXext-devel
 Add_dependency run libXi-devel
+Add_dependency run libXxf86misc-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run cairo-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run gtk+3-devel
+Add_dependency run libxml2-devel
+Add_dependency run libxklavier-devel
+Add_dependency run libnotify-devel
+Add_dependency run polkit-devel
+Add_dependency run libcanberra-devel
+Add_dependency run pulseaudio-devel
+Add_dependency run nspr-devel
+Add_dependency run nss-devel
+Add_dependency run startup-notification-devel
+Add_dependency run GConf-devel
+Add_dependency run gnome-desktop-devel
+Add_dependency run libgnomekbd-devel
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/gnome-settings-daemon-2.0
+	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/gnome-settings-daemon-2.0/*.a \
-		${DESTDIR}/usr/lib/gnome-settings-daemon-2.0
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index cad7afdb29a..40fb83f5dc7 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,93 +1,82 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=2.32.1
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.90
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+configure_args="--localstatedir=/var --disable-static"
 short_desc="GNOME settings daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
+checksum=333790ebd671e1046510dd128ac997571af56767ea72919d7966690c7ec9cb54
 long_desc="
  This package provides a daemon to handle settings on the GNOME desktop."
 
-gconf_schemas="
-desktop_gnome_peripherals_smartcard.schemas
-apps_gnome_settings_daemon_housekeeping.schemas
-apps_gnome_settings_daemon_keybindings.schemas
-apps_gnome_settings_daemon_xrandr.schemas
-desktop_gnome_peripherals_touchpad.schemas
-desktop_gnome_font_rendering.schemas
-gnome-settings-daemon.schemas
-desktop_gnome_keybindings.schemas"
-
+# XXX add missing cups support.
+triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
-Add_dependency run polkit
 Add_dependency run glib
-Add_dependency run dbus-glib
-Add_dependency run gtk+
-Add_dependency run cairo
-Add_dependency run libX11
-Add_dependency run GConf
 Add_dependency run dbus-libs
-Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run atk
-Add_dependency run pango
-Add_dependency run gdk-pixbuf
+Add_dependency run dbus-glib
 Add_dependency run libpng
-Add_dependency run freetype
-Add_dependency run fontconfig
 Add_dependency run libSM
 Add_dependency run libICE
+Add_dependency run libX11
 Add_dependency run libXext
 Add_dependency run libXi
-Add_dependency run libpulseaudio
-Add_dependency run libcanberra
 Add_dependency run libXxf86misc
-Add_dependency run libnotify
-Add_dependency run nss
-Add_dependency run nspr
-Add_dependency run libgnomekbd
-Add_dependency run libxklavier
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run cairo
+Add_dependency run gdk-pixbuf
+Add_dependency run gtk+3
 Add_dependency run libxml2
+Add_dependency run libxklavier
+Add_dependency run libnotify
+Add_dependency run polkit
+Add_dependency run libcanberra
+Add_dependency run libpulseaudio
+Add_dependency run nspr
+Add_dependency run nss
+Add_dependency run startup-notification
+Add_dependency run GConf
+Add_dependency run gnome-desktop
+Add_dependency run libgnomekbd
 
 Add_dependency build pkg-config
 Add_dependency build intltool
-Add_dependency build polkit-devel
 Add_dependency build glib-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+-devel
-Add_dependency build cairo-devel
-Add_dependency build libX11-devel
-Add_dependency build GConf-devel
 Add_dependency build dbus-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
+Add_dependency build dbus-glib-devel
 Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
+Add_dependency build libX11-devel
 Add_dependency build libXext-devel
 Add_dependency build libXi-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build libcanberra-devel
 Add_dependency build libXxf86misc-devel
-Add_dependency build libnotify-devel
-Add_dependency build nss-devel
-Add_dependency build nspr-devel
-Add_dependency build libgnomekbd-devel
-Add_dependency build libxklavier-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build cairo-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gtk+3-devel
 Add_dependency build libxml2-devel
+Add_dependency build libxklavier-devel
+Add_dependency build libnotify-devel
+Add_dependency build polkit-devel
+Add_dependency build libcanberra-devel
+Add_dependency build pulseaudio-devel
+Add_dependency build nspr-devel
+Add_dependency build nss-devel
+Add_dependency build startup-notification-devel
+Add_dependency build GConf-devel
+Add_dependency build gnome-desktop-devel
+Add_dependency build libgnomekbd-devel
 
 Add_dependency full pulseaudio
 Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils