diff --git a/mac/gramps.modules b/mac/gramps.modules
index 6ee365f28..a6b319f75 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -2,6 +2,7 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
+
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="pywebkitgtk"
@@ -15,7 +16,7 @@
   <repository type="svn" name="gramps"
 	      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"
@@ -28,7 +29,7 @@
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
   <repository type="tarball" name="yorba"
 	      href="http://yorba.org/download/"/>
-   <repository type="tarball" name="exiv2.org"
+  <repository type="tarball" name="exiv2.org"
 	      href="http://exiv2.org/"/>
   <repository type="tarball" name="pythonware"
 	      href="http://effbot.org/downloads/"/>
@@ -57,8 +58,6 @@ 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/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
@@ -75,7 +74,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="graphviz"/>
       <dep package="pil"/>
       <dep package='pyicu'/>
-      <dep package='gexiv2'/>
+      <dep package="gexiv2"/>
     </dependencies>
   </distutils>
 
@@ -93,7 +92,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="graphviz"/>
       <dep package="pil"/>
       <dep package='pyicu'/>
-      <dep package='gexiv2'/>
+      <dep package="gexiv2"/>
     </dependencies>
   </distutils>
 
@@ -141,7 +140,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
  </autotools>
 
   <autotools id="osmgpsmap">
-    <branch module="SNoiraud/osm-gps-map" revision="gtk3" repo="github"/>
+    <branch module="nzjrs/osm-gps-map" repo="github"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libsoup"/>
@@ -175,7 +174,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 	     autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --with-pangocairo --with-included-ltdl=yes">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
     <dependencies>
-      <dep package='pango'/>
+      <dep package="pango"/>
       <dep package="meta-gtk-osx-freetype"/>
       <dep package="librsvg"/>
     </dependencies>
@@ -199,7 +198,6 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
   <distutils id="pil">
     <branch module="Imaging-1.1.7.tar.gz" version="1.1.7" repo="pythonware"/>
-    <!--branch module="sloonz/pil-py3k.git" repo="github"/-->
   </distutils>
 
   <autotools id='icu' autogen-sh='source/configure'