diff --git a/mac/gramps.modules b/mac/gramps.modules
index 49c1ead91..15ad975fb 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -14,17 +14,17 @@
   <repository type="tarball" name="xdg-utils"
 	      href="http://portland.freedesktop.org/download/"/>
   <repository type="svn" name="gramps"
-	      href="https://gramps.svn.sourceforge.net/svnroot/"/>
+	      href="http://svn.code.sf.net/p/gramps/code/"/>
   <repository type="svn" name="gramps-addons"
-	      href="https://gramps-addons.svn.sourceforge.net/svnroot/gramps-addons/"/>
+	      href="https://svn.code.sf.net/p/gramps-addons/code/"/>
   <repository type="tarball" name="oracle"
 	      href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
 	      href="http://pypi.python.org/packages/source/"/>
   <repository type="tarball" name="stowers"
 	     href="http://www.johnstowers.co.nz/files/"/>
-  <repository type="git" name="snoiraud"
-	      href="git://github.com/SNoiraud"/>
+  <repository type="git" name="github"
+	      href="git://github.com/"/>
   <repository type="tarball" name="graphviz"
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
   <repository type="tarball" name="yorba"
@@ -58,15 +58,11 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
 -->
 
-
-
   <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
-  <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+  <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
-
-
-  <distutils id="gramps-svn" >
-    <branch module="code" repo="gramps"/>
+  <distutils id="gramps-svn" supports-non-srcdir-builds="no">
+    <branch module="trunk" repo="gramps"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
       <dep package="goocanvas"/>
@@ -82,8 +78,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </distutils>
 
-  <distutils id="gramps-40">
-    <branch module="gramps/gramps-4.0.0-alpha5.tar.gz" version="4.0.0-alpha5"
+  <distutils id="gramps-40" supports-non-srcdir-builds="no">
+    <branch module="gramps/gramps-4.0.0-tar.gz" version="4.0.0"
 	    repo="sourceforge"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
@@ -134,7 +130,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
  </autotools>
 
   <autotools id="osmgpsmap">
-    <branch module="osm-gps-map" revision="gtk3" repo="snoiraud"/>
+    <branch module="nzjrs/osm-gps-map" repo="github"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libsoup"/>
@@ -170,27 +166,21 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <dependencies>
       <dep package="pango"/>
       <dep package="meta-gtk-osx-freetype"/>
-      <dep package="zlib"/>
+      <dep package="librsvg"/>
     </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">
+  <autotools id="exiv2" supports-non-srcdir-builds="no">
     <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org" version="0.21.1"/>
   </autotools>
 
-  <autotools id="gexiv2" autogen-sh="configure"
+  <autotools id="gexiv2" autogen-sh="configure" supports-non-srcdir-builds="no"
 	     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"/>
+	    repo="yorba" version="0.5.0">
+      <patch file='gexiv2-libtool.patch' strip="1"/>
+    </branch>
     <dependencies>
       <dep package="exiv2"/>
     </dependencies>