diff --git a/srcpkgs/gnome-shell/gnome-shell.rshlibs b/srcpkgs/gnome-shell/gnome-shell.rshlibs
index 96628b250ff..1195f9468d6 100644
--- a/srcpkgs/gnome-shell/gnome-shell.rshlibs
+++ b/srcpkgs/gnome-shell/gnome-shell.rshlibs
@@ -1,51 +1,60 @@
+libatk-bridge-2.0.so.0
 libmutter.so.0
+libgjs.so.0
 libgirepository-1.0.so.1
 libtelepathy-glib.so.0
-libdbus-glib-1.so.2
+libclutter-1.0.so.0
 libgtk-3.so.0
-libgdk-3.so.0
-libcairo.so.2
+libgio-2.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libecal-1.2.so.15
 libical.so.0
-libedataserverui-3.0.so.1
-libgconf-2.so.4
-libgio-2.0.so.0
+libedataserver-1.2.so.17
 libgdk_pixbuf-2.0.so.0
-libfolks.so.25
-libgee.so.2
-libgjs.so.0
+libgdk-3.so.0
+libcairo.so.2
 libmozjs185.so.1.0
 libplds4.so
 libplc4.so
 libnspr4.so
 libdl.so.2
 libgnome-menu-3.so.0
-libgstbase-0.10.so.0
-libgstreamer-0.10.so.0
+libgstbase-1.0.so.0
+libgstreamer-1.0.so.0
+libgthread-2.0.so.0
 libsoup-2.4.so.1
+libGL.so.1
 libstartup-notification-1.so.0
-libffi.so.5
 libcanberra.so.0
 libtelepathy-logger.so.2
 libpolkit-agent-1.so.0
 libpolkit-gobject-1.so.0
 libnm-glib.so.4
 libnm-util.so.2
+libdbus-glib-1.so.2
 libdbus-1.so.3
 libgnome-keyring.so.0
+libgcr-3.so.1
+libgcr-base-3.so.1
+libgck-1.so.0
+libp11-kit.so.0
+libgnome-desktop-3.so.4
+libsystemd-login.so.0
+libsystemd-daemon.so.0
 libgnome-bluetooth-applet.so.0
 libm.so.6
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
-libGL.so.1
 libXi.so.6
-libdrm.so.2
+libcogl.so.11
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
+libgmodule-2.0.so.0
+librt.so.1
 libXfixes.so.3
 libcroco-0.6.so.3
 libxml2.so.2
@@ -54,18 +63,5 @@ libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
-libgmodule-2.0.so.0
 libpulse-mainloop-glib.so.0
 libpulse.so.0
-libgthread-2.0.so.0
-librt.so.1
-libgcr-3.so.1
-libgcr-base-3.so.1
-libgck-1.so.0
-libp11-kit.so.0
-libclutter-1.0.so.0
-libcogl.so.9
-libecal-1.2.so.11
-libedataserver-1.2.so.16
-libsystemd-login.so.0
-libsystemd-daemon.so.0
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 61ca821e283..76d8416319f 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,25 +1,25 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.4.2
+version=3.6.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --with-systemd
---with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+configure_args="--disable-schemas-compile --with-systemd"
 depends="caribou pulseaudio mesa-demos desktop-file-utils"
 makedepends="pkg-config intltool gnome-doc-utils gobject-introspection
 json-glib-devel>=0.14.0 startup-notification-devel network-manager-applet-devel
-folks-devel gnome-menus-devel gnome-desktop-devel gnome-bluetooth-devel>=3.4.0_1
-libcroco-devel gjs-devel mutter-devel telepathy-logger-devel libcanberra-devel
-pulseaudio-devel polkit-devel libgnome-keyring-devel gcr-devel libgudev-devel
-gst-plugins-base-devel systemd-devel"
-fulldepends="ca-certificates gir-freedesktop"
+folks-devel gnome-menus-devel>=3.6.0 gnome-desktop-devel>=3.6.0 gcr-devel>=3.6.0
+gnome-bluetooth-devel>=3.6.0 mutter-devel>=3.6.0 libcroco-devel
+gjs-devel telepathy-logger-devel libcanberra-devel polkit-devel
+pulseaudio-devel libgnome-keyring-devel>=3.6.0 libgudev-devel
+gst-plugins-base1-devel systemd-devel"
+fulldepends="gir-freedesktop"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 short_desc="GNOME core user interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GnomeShell"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=032ad32a4fa6c1f92010635e3076031323ac690f78c610184438c085c355e07b
 long_desc="
  GNOME Shell provides core user interface functions for the GNOME 3 desktop,
  like switching to windows and launching applications. GNOME Shell takes