diff --git a/mac/gramps.modules b/mac/gramps.modules
index 1dfb3697b..49c1ead91 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -27,8 +27,8 @@
 	      href="git://github.com/SNoiraud"/>
   <repository type="tarball" name="graphviz"
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
-  <repository type="tarball" name="launchpad"
-	      href="http://launchpad.net/"/>
+  <repository type="tarball" name="yorba"
+	      href="http://yorba.org/download/"/>
   <repository type="tarball" name="exiv2.org"
 	      href="http://exiv2.org/"/>
   <repository type="tarball" name="pythonware"
@@ -78,14 +78,12 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="graphviz"/>
       <dep package="pil"/>
       <dep package='pyicu'/>
+      <dep package="gexiv2"/>
     </dependencies>
-    <after>
-      <dep package="pyexiv2"/>
-    </after>
   </distutils>
 
   <distutils id="gramps-40">
-    <branch module="gramps/gramps-4.0.0-alpha4.tar.gz" version="4.0.0-alpha4"
+    <branch module="gramps/gramps-4.0.0-alpha5.tar.gz" version="4.0.0-alpha5"
 	    repo="sourceforge"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
@@ -97,10 +95,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="osmgpsmap"/>
       <dep package="graphviz"/>
       <dep package="pil"/>
+      <dep package='pyicu'/>
+      <dep package="gexiv2"/>
     </dependencies>
-    <after>
-      <dep package="pyexiv2"/>
-    </after>
   </distutils>
 
   <distutils id="gramps-addons-svn">
@@ -177,29 +174,26 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </autotools>
 
+  <autotools id="goocanvas" autogen-sh="configure">
+    <branch module="goocanvas/2.0/goocanvas-2.0.1.tar.bz2" version="2.0.1"
+	    repo="ftp.gnome.org" hash="sha256:e7491c30325318d4f5fe2683eb63e6195b484b2f330c3f07c96bbb9213027773"/>
+    <dependencies>
+      <dep package="gtk+-3.0"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="exiv2">
     <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org" version="0.21.1"/>
   </autotools>
 
-  <autotools id="boost">
-    <branch module="boost/boost_1_52_0.tar.bz2" repo="sourceforge"
-	    version="1.52.1"/>
-  </autotools>
-
-  <distutils id="scons">
-    <branch repo="sourceforge" module="scons/scons-2.0.1.tar.gz" version="2.0.1"/>
-  </distutils>
-
-  <autotools id="pyexiv2">
-    <branch module="pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2"
-	    repo="launchpad" version="0.3.0"/>
+  <autotools id="gexiv2" autogen-sh="configure"
+	     autogenargs="--enable-introspection"
+	     autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
+    <branch module="gexiv2/0.5/libgexiv2-0.5.0.tar.xz"
+	    repo="yorba" version="0.5.0"/>
     <dependencies>
       <dep package="exiv2"/>
-      <dep package="scons"/>
     </dependencies>
-    <after>
-      <dep package="boost"/>
-    </after>
   </autotools>
 
   <distutils id="pil">