diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
deleted file mode 100644
index c05529ec6..000000000
--- a/tools/build/gnome-shell.modules
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<!-- vim:set ts=2 expandtab: -->
-<moduleset>
-  <repository type="git" name="git.gnome.org"
-      href="git://git.gnome.org/"/>
-  <repository type="git" name="git.moblin.org"
-      href="git://git.moblin.org"/>
-  <repository type="tarball" name="cairo.org"
-      href="http://cairographics.org/"/>
-  <repository type="tarball" name="0pointer.de"
-      href="http://0pointer.de/lennart/projects/"/>
-  <repository type="git" name="git.freedesktop.org"
-      href="git://anongit.freedesktop.org"/>
-  <repository type="git" name="colord.gitorious.org"
-      href="git://gitorious.org/colord/master.git"/>
-
-  <tarball id="libgee" version="0.6.0">
-    <pkg-config/>
-    <source hash="sha256:e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a" href="http://download.gnome.org/sources/libgee/0.6/libgee-0.6.0.tar.bz2" md5sum="4eb513b23ab6ea78884989518a4acf6f" size="477609"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </tarball>
-
-  <tarball id="folks" version="0.6.0">
-    <source hash="sha256:50539da0b42564887bbce67d3a4107f3a7dbd8c6ae3b5d3a2d422b4f75a2b519" href="http://ftp.gnome.org/pub/GNOME/sources/folks/0.6/folks-0.6.0.tar.bz2" md5sum="4d5a3619c8b6e0714d02941c92826160" size="1261916"/>
-    <dependencies>
-      <dep package="libgee"/>
-      <dep package="vala"/>
-      <dep package="gobject-introspection"/>
-      <dep package="telepathy-glib"/>
-      <dep package="evolution-data-server"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="gnome-contacts">
-    <source hash="sha256:db52d4521e5d3335b5bf77ce5d1a7ec2cdea9ebf37ce12ddadda0503a2968cf9" href="http://ftp.gnome.org/pub/GNOME/sources/gnome-contacts/0.1/gnome-contacts-0.1.2.tar.bz2" size="377930"/>
-    <dependencies>
-      <dep package="folks"/>
-      <dep package="glib"/>
-      <dep package="gtk3"/>
-      <dep package="vala"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="gobject-introspection">
-    <branch repo="git.gnome.org" module="gobject-introspection"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glib">
-    <branch repo="git.gnome.org" module="glib" />
-  </autotools>
-
-  <tarball id="vala" version="0.13.1" autogenargs="--enable-vapigen">
-    <source href="http://download.gnome.org/sources/vala/0.13/vala-0.13.1.tar.bz2"
-            hash="sha256:f7032980eb212254a1209c6252cac9d357b4798b35ea551b5ee6e524c0d287ff"
-            md5sum="d2226fc4c097b73830eb8ed56252c720" size="2758783"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="atk">
-    <branch repo="git.gnome.org" module="atk"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch module="releases/pixman-0.18.4.tar.gz" version="0.18.4"
-            repo="cairo.org"
-            hash="sha256:1484092277c5187f5458229a2b7fd7fbc0cb07e1f220c7f8f9ac65de6dba7989"
-            md5sum="532db4194e18c108d0b7dd85f20d39b8" size="510878">
-    </branch>
-  </autotools>
-
-  <autotools id="cairo">
-    <branch module="releases/cairo-1.10.0.tar.gz" version="1.10.0"
-            repo="cairo.org"
-            hash="sha256:0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"
-            md5sum="70a2ece66cf473d976e2db0f75bf199e" size="24022822">
-    </branch>
-    <dependencies>
-      <dep package="pixman"/>
-    </dependencies>
-  </autotools>
-
-  <tarball id="startup-notification" version="0.12">
-    <source href="http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz"
-            hash="sha256:3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"
-            size="355285"/>
-  </tarball>
-
-  <autotools id="pango">
-    <branch repo="git.gnome.org" module="pango"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gdk-pixbuf">
-    <branch repo="git.gnome.org" module="gdk-pixbuf"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk3">
-    <branch checkoutdir="gtk3" repo="git.gnome.org" module="gtk+"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-themes-standard">
-    <branch repo="git.gnome.org" module="gnome-themes-standard"/>
-    <dependencies>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gjs">
-    <branch repo="git.gnome.org" module="gjs"/>
-    <dependencies>
-        <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="json-glib">
-    <branch repo="git.gnome.org" module="json-glib"/>
-    <dependencies>
-        <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="cogl">
-    <branch repo="git.gnome.org" module="cogl" revision="cogl-1.8"/>
-    <dependencies>
-        <dep package="glib"/>
-        <dep package="gobject-introspection"/>
-        <dep package="cairo"/>
-        <dep package="pango"/>
-        <dep package="gdk-pixbuf"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="clutter">
-    <branch repo="git.gnome.org" module="clutter" revision="clutter-1.8"/>
-    <dependencies>
-        <dep package="cogl"/>
-        <dep package="json-glib"/>
-        <dep package="gobject-introspection"/>
-        <dep package="atk"/>
-        <dep package="pango"/>
-        <dep package="gdk-pixbuf"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dconf" autogenargs="--disable-editor">
-    <branch repo="git.gnome.org" module="dconf"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gconf" autogenargs="--disable-defaults-service">
-    <branch repo="git.gnome.org" module="gconf"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mutter">
-    <branch repo="git.gnome.org" module="mutter"/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="gconf"/>
-      <dep package="gtk3"/>
-      <dep package="libcanberra"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--disable-gtk-theme">
-    <branch repo="git.gnome.org" module="librsvg"/>
-    <dependencies>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gsettings-desktop-schemas">
-    <branch repo="git.gnome.org" module="gsettings-desktop-schemas" />
-  </autotools>
-
-  <autotools id="gnome-desktop-3">
-    <branch repo="git.gnome.org" checkoutdir="gnome-desktop-3" module="gnome-desktop"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk3"/>
-      <dep package="gconf"/>
-      <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-icon-theme">
-    <branch repo="git.gnome.org" module="gnome-icon-theme" />
-  </autotools>
-
-  <autotools id="gnome-icon-theme-symbolic">
-    <branch repo="git.gnome.org" module="gnome-icon-theme-symbolic" />
-  </autotools>
-
-  <autotools id="libcanberra" autogen-sh="configure">
-    <branch repo="0pointer.de" module="libcanberra/libcanberra-0.26.tar.gz" version="0.26"
-            hash="sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982"
-            md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209">
-      <patch file="libcanberra-quit-add.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="librest">
-    <branch repo="git.gnome.org" module="librest"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-online-accounts">
-    <branch repo="git.gnome.org" module="gnome-online-accounts"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk3"/>
-      <dep package="json-glib"/>
-      <dep package="libnotify"/>
-      <dep package="librest"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-control-center">
-    <branch repo="git.gnome.org" module="gnome-control-center"/>
-    <dependencies>
-      <dep package="gtk3"/>
-      <dep package="libcanberra"/>
-      <dep package="gnome-desktop-3"/>
-      <dep package="gnome-menus"/>
-      <dep package="gnome-settings-daemon"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="colord"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="colord" autogenargs="--disable-examples">
-    <branch repo="colord.gitorious.org" checkoutdir="colord" module="master"/>
-    <dependencies>
-      <dep package="glib"/>
-      <!-- and cups -->
-      <!-- and sane -->
-    </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="glib-networking">
-    <branch repo="git.gnome.org" module="glib-networking"/>
-    <dependencies>
-     <dep package="glib"/>
-     <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libsoup">
-    <branch repo="git.gnome.org" module="libsoup"/>
-    <dependencies>
-     <dep package="glib-networking"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgdata">
-    <branch repo="git.gnome.org" module="libgdata"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="libgweather">
-    <branch repo="git.gnome.org" module="libgweather"/>
-    <dependencies>
-     <dep package="libsoup"/>
-     <dep package="gconf"/>
-     <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="evolution-data-server">
-    <branch repo="git.gnome.org" module="evolution-data-server"/>
-    <dependencies>
-     <dep package="libgweather"/>
-     <dep package="libgdata"/>
-     <dep package="gnome-online-accounts"/>
-     <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="telepathy-glib" autogenargs="--disable-Werror" >
-    <branch repo="git.freedesktop.org" module="telepathy/telepathy-glib" />
-    <dependencies>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="telepathy-logger" autogenargs="--enable-introspection --disable-Werror">
-    <branch repo="git.freedesktop.org" module="telepathy/telepathy-logger" />
-    <dependencies>
-      <dep package="telepathy-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-shell" autogenargs="--enable-jhbuild-wrapper-script">
-    <branch repo="git.gnome.org" module="gnome-shell"/>
-    <dependencies>
-        <dep package="startup-notification"/>
-        <dep package="evolution-data-server"/>
-        <dep package="gobject-introspection"/>
-        <dep package="mutter"/>
-        <dep package="gjs"/>
-        <dep package="caribou"/>
-        <dep package="dconf"/>
-        <dep package="folks"/>
-        <dep package="gconf"/>
-        <dep package="glib"/>
-        <dep package="gnome-contacts"/>
-        <dep package="gnome-menus"/>
-        <dep package="gnome-desktop-3"/>
-        <dep package="gsettings-desktop-schemas"/>
-        <dep package="gnome-icon-theme"/>
-        <dep package="gnome-icon-theme-symbolic"/>
-        <dep package="libcanberra"/>
-        <dep package="gnome-settings-daemon"/>
-        <dep package="gnome-bluetooth"/>
-        <dep package="telepathy-glib"/>
-        <dep package="telepathy-logger"/>
-        <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
-  <!-- This doesn't actually use gir-repository anymore,
-       kept just for compatibility to avoid having everyone
-       change their ~/.jhbuildrc -->
-  <metamodule id="gnome-shell-using-gir-repository">
-    <dependencies>
-      <dep package="gnome-shell-full"/>
-    </dependencies>
-  </metamodule>
-
-  <metamodule id="gnome-shell-full">
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="gnome-themes-standard"/>
-      <dep package="gnome-shell"/>
-    </dependencies>
-  </metamodule>
-
-  <autotools id="gnome-bluetooth" autogenargs="--disable-nautilus-sendto">
-    <branch repo="git.gnome.org" module="gnome-bluetooth" />
-    <dependencies>
-       <dep package="gobject-introspection"/>
-       <dep package="gnome-control-center"/>
-       <dep package="libnotify"/>
-    </dependencies>
-  </autotools>
-
-  <tarball id="polkit" version="0.100">
-    <source href="http://hal.freedesktop.org/releases/polkit-0.100.tar.gz"
-            hash="sha256:afe63bec81b7f49e884ea4f2671ec76db121d84d05f36e75cde9b4ca4c828186"
-            md5sum="9f957bf046ff5a32b0fa0ffe1e35c09c" size="1050355"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </tarball>
-
-  <autotools id="libnotify">
-    <branch repo="git.gnome.org" module="libnotify"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-menus">
-    <branch repo="git.gnome.org" module="gnome-menus"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-settings-daemon">
-    <branch repo="git.gnome.org" module="gnome-settings-daemon"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk3"/>
-      <dep package="gnome-desktop-3"/>
-      <dep package="libgnomekbd"/>
-      <dep package="libnotify" />
-      <dep package="polkit"/>
-      <dep package="colord"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgnomekbd">
-    <branch repo="git.gnome.org" module="libgnomekbd"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxklavier"/>
-    </dependencies>
-  </autotools>
-
-  <tarball id="libxklavier" supports-non-srcdir-builds="no" version="5.1">
-    <source href="http://download.gnome.org/sources/libxklavier/5.1/libxklavier-5.1.tar.bz2"
-            hash="sha256:1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1"
-            md5sum="cbc2a760827c20aef61eb7b18a6ce598"
-            size="346858"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="caribou">
-    <branch repo="git.gnome.org" module="caribou"/>
-    <dependencies>
-      <dep package="libgee"/>
-      <dep package="gtk3"/>
-      <dep package="clutter"/>
-      <dep package="libxklavier"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-</moduleset>
diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell
index f30c5400b..90ae34fb5 100644
--- a/tools/build/jhbuildrc-gnome-shell
+++ b/tools/build/jhbuildrc-gnome-shell
@@ -18,11 +18,9 @@
 # Only rebuild modules that have changed
 build_policy = 'updated'
 
-moduleset = 'http://git.gnome.org/browse/gnome-shell/plain/tools/build/gnome-shell.modules'
+moduleset = 'gnome-apps-3.4'
 
-modules = [ 'gnome-shell-using-gir-repository' ]
-# Enable this one to use introspection built from the stack itself
-# modules = [ 'gnome-shell-full' ]
+modules = [ 'meta-gnome-core-shell' ]
 
 # what directory should the source be checked out to?
 checkoutroot = os.path.expanduser('~/gnome-shell/source')
diff --git a/tools/build/libcanberra-quit-add.patch b/tools/build/libcanberra-quit-add.patch
deleted file mode 100644
index 0094569ae..000000000
--- a/tools/build/libcanberra-quit-add.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
---- libcanberra-0.26/src/canberra-gtk-module.c.quit-add	2011-01-07 22:48:49.388992626 -0500
-+++ libcanberra-0.26/src/canberra-gtk-module.c	2011-01-07 22:49:02.339995153 -0500
-@@ -932,11 +932,6 @@ static void connect_settings(void) {
-         connected = TRUE;
- }
- 
--static gboolean quit_handler(gpointer data) {
--        dispatch_queue();
--        return FALSE;
--}
--
- G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
- 
-         /* This is the same quark libgnomeui uses! */
-@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
-         install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
-         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
-         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
--
--        gtk_quit_add(1, quit_handler, NULL);
- }
- 
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);