diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index 99e741799..7a864ed9a 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -63,7 +63,7 @@ fi
 # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification,
 # xdamage, icon-naming-utils, upower, libtool-ltdl, libvorbis,
 # libgcrypt, libtasn1, libgnome-keyring, libgtop, cups,
-# evolution-data-server libusb
+# libusb, libproxy, libdb
 #
 # Non-devel packages needed by gnome-shell and its deps:
 # glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,
@@ -82,8 +82,7 @@ if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint
     xulrunner-dev libcroco3-dev
     libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good
     libltdl-dev libvorbis-dev iso-codes libgnome-keyring-dev libusb-1.0-0-dev
-    libupower-glib-dev libcups2-dev evolution-data-server-dev
-    libecal1.2-dev libedataserverui1.2-dev
+    libupower-glib-dev libcups2-dev libproxy-dev libdb-dev
     "
 
   if apt-cache show autopoint > /dev/null 2> /dev/null; then
@@ -121,7 +120,7 @@ if test "x$system" = xFedora ; then
     startup-notification-devel zenity
     icon-naming-utils upower-devel libtool-ltdl-devel libvorbis-devel
     iso-codes-devel libgcrypt-devel libtasn1-devel libtasn1-tools libusb1-devel
-    libgnome-keyring-devel libgtop2-devel cups-devel evolution-data-server-devel
+    libgnome-keyring-devel libgtop2-devel cups-devel db4-devel libproxy-devel
     "
 
   if expr $version \>= 14 > /dev/null ; then
diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index b32104ef5..e9f1407a8 100644
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -200,6 +200,43 @@
     </dependencies>
   </autotools>
 
+  <autotools id="glib-networking">
+    <branch repo="git.gnome.org" module="glib-networking"/>
+    <dependencies>
+     <dep package="glib"/>
+    </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="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgweather">
+    <branch repo="git.gnome.org" module="libgweather"/>
+    <dependencies>
+     <dep package="libsoup"/>
+    </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="gtk3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-power-manager">
     <branch repo="git.gnome.org" module="gnome-power-manager" />
     <dependencies>
@@ -223,6 +260,7 @@
   <autotools id="gnome-shell" autogenargs="--enable-jhbuild-wrapper-script">
     <branch repo="git.gnome.org" module="gnome-shell"/>
     <dependencies>
+        <dep package="evolution-data-server"/>
         <dep package="gobject-introspection"/>
         <dep package="mutter"/>
         <dep package="gjs"/>