diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 24b1eccfdd6..8f5dd8f4b9e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.0.2
-revision=4
-distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+version=3.2.0
+distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-schemas-compile
 --localstatedir=/var --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 short_desc="GNOME core user interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95
+homepage="http://live.gnome.org/GnomeShell"
+license="GPL-2"
+checksum=55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324
 long_desc="
  GNOME Shell provides core user interface functions for the GNOME 3 desktop,
  like switching to windows and launching applications. GNOME Shell takes
@@ -21,91 +22,73 @@ gconf_schemas="$pkgname.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
-Add_dependency run js
+Add_dependency run mutter
+Add_dependency run libgirepository
+Add_dependency run telepathy-glib
+Add_dependency run dbus-glib
+Add_dependency run clutter
+Add_dependency run gtk+3
+Add_dependency run cairo
+Add_dependency run glib
+Add_dependency run evolution-data-server
+Add_dependency run libical
+Add_dependency run GConf
+Add_dependency run gdk-pixbuf
+Add_dependency run folks
+Add_dependency run libgee
 Add_dependency run gjs
+Add_dependency run js
+Add_dependency run nspr
 Add_dependency run gnome-menus
 Add_dependency run gstreamer
-Add_dependency run libgirepository
+Add_dependency run libsoup
+Add_dependency run startup-notification
 Add_dependency run libffi
 Add_dependency run libcanberra
-Add_dependency run telepathy-glib
+Add_dependency run telepathy-logger
 Add_dependency run polkit
+Add_dependency run NetworkManager
+Add_dependency run dbus-libs
+Add_dependency run libgnome-keyring
 Add_dependency run gnome-bluetooth
-Add_dependency run clutter
+Add_dependency run cogl
 Add_dependency run json-glib
 Add_dependency run MesaLib
+Add_dependency run libXi
 Add_dependency run libdrm
-Add_dependency run libX11
 Add_dependency run libXext
 Add_dependency run libXdamage
 Add_dependency run libXcomposite
-Add_dependency run libXi
 Add_dependency run libXfixes
 Add_dependency run libcroco
+Add_dependency run libxml2
 Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run libpulseaudio
-Add_dependency run evolution-data-server
-Add_dependency run libical
-Add_dependency run gtk+3
+Add_dependency run libX11
 Add_dependency run atk
 Add_dependency run pango
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run cairo
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run nspr
-Add_dependency run nss
-Add_dependency run sqlite
-Add_dependency run libxml2
-Add_dependency run GConf
-Add_dependency run libsoup
-Add_dependency run glib
-Add_dependency run telepathy-logger
-Add_dependency run mutter		">=3.0.2.1_2"
+Add_dependency run pulseaudio
+Add_dependency run libpulseaudio
+
 Add_dependency run mesa-demos
 Add_dependency run desktop-file-utils
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
-Add_dependency build gjs-devel
+Add_dependency build network-manager-applet-devel
+Add_dependency build caribou-devel
+Add_dependency build folks-devel
 Add_dependency build gnome-menus-devel
-Add_dependency build gstreamer-devel
-Add_dependency build libgirepository-devel
-Add_dependency build libffi-devel
-Add_dependency build libcanberra-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build polkit-devel
-Add_dependency build gnome-bluetooth-devel
-Add_dependency build clutter-devel
-Add_dependency build json-glib-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libdrm-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXi-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libcroco-devel
 Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build libical-devel
-Add_dependency build gtk+3-devel
-Add_dependency build nss-devel
-Add_dependency build sqlite-devel
-Add_dependency build libxml2-devel
-Add_dependency build GConf-devel
-Add_dependency build libsoup-devel
+Add_dependency build gnome-bluetooth-devel
+Add_dependency build libcroco-devel
+Add_dependency build gjs-devel
+Add_dependency build mutter-devel
 Add_dependency build telepathy-logger-devel
-Add_dependency build mutter-devel	">=3.0.2.1_1"
+Add_dependency build json-glib-devel	">=0.14.0"
+Add_dependency build pulseaudio-devel
 
 Add_dependency full gir-freedesktop