diff --git a/mac/Info.plist b/mac/Info.plist
index c7734a63a..8462b7ba6 100755
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Gramps 3.4.1-1, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
+    <string>Gramps 3.4.2-1, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,13 +17,13 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>3.4.1-1</string>
+    <string>3.4.2-1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleName</key>
     <string>Gramps</string>
     <key>CFBundleVersion</key>
-    <string>3.4.1-1</string>
+    <string>3.4.2-1</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 1997 - 2012 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index 9db6ab404..7796d67b1 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -38,7 +38,11 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libpython2.7.dylib
   </binary>
 
   <!-- Copy in libpyglib, which will pull in other dependencies we need -->
@@ -63,7 +67,7 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libgtkmacintegration.0.dylib
+    ${prefix}/lib/libgtkmacintegration.2.dylib
   </binary>
 
   <binary>
@@ -133,6 +137,10 @@
     ${prefix}/include/python2.7/pyconfig.h
   </data>
 
+  <data>
+    ${prefix}/etc/pango/
+  </data>
+
   <data>
     ${prefix}/share/gramps/
   </data>
@@ -153,10 +161,6 @@
     ${prefix}/share/mime-info/
   </data>
 
-  <data>
-    ${prefix}/lib/graphviz/config6
-  </data>
-
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
   <data>
diff --git a/mac/gramps.launcher b/mac/gramps.launcher
index 54d48e548..47bca2695 100755
--- a/mac/gramps.launcher
+++ b/mac/gramps.launcher
@@ -21,6 +21,8 @@ export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
diff --git a/mac/gramps.modules b/mac/gramps.modules
index df500fb1c..68cea110c 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -14,7 +14,7 @@
   <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/"/>
   <repository type="tarball" name="oracle"
@@ -57,17 +57,17 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
 
 
-  <include href="https://raw.github.com/jralls/gtk-osx-build/master/modulesets-stable/gtk-osx.modules"/>
-  <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+  <!--include href="https://raw.github.com/jralls/gtk-osx-build/master/modulesets-stable/gtk-osx.modules"/-->
+  <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
 
 
   <autotools id="gramps" autogen-sh="configure">
-    <branch module="gramps/gramps-3.4.1.tar.gz" version="3.4.1"
+    <branch module="gramps/gramps-3.4.2.tar.gz" version="3.4.2"
 	    repo="sourceforge">
     </branch>
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
-      <dep package="pyWebKitGtk"/>
+      <!--dep package="pyWebKitGtk"/-->
       <dep package="librsvg2"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
@@ -117,26 +117,16 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </autotools>
 
-<!-- Later versions of librsvg2 require libxml2-2.7, available only in
-     Snow Leopard -->
-  <autotools id="librsvg2" >
-    <branch module="librsvg/2.22/librsvg-2.22.3.tar.bz2" version="2.22.3"
-	    repo="ftp.gnome.org"/>
-    <dependencies>
-      <dep package="libgsf"/>
-      <dep package="libart_lgpl"/><!-- goffice.modules -->
-    </dependencies>
-  </autotools>
-
-  <autotools id="goocanvas">
-    <branch module="goocanvas/0.15/goocanvas-0.15.tar.bz2" version="0.15"
-	    repo="ftp.gnome.org"/>
+<!-- goocanvas 2.0 is for Gtk+-3.0. Go figure. -->
+  <autotools id="goocanvas" autogen-sh="configure">
+    <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0"
+	    repo="ftp.gnome.org" hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pygoocanvas" version="0.14.1">
+  <autotools id="pygoocanvas" version="0.14.1" autogen-sh="configure">
     <branch module="pygoocanvas/0.14/pygoocanvas-0.14.1.tar.gz" version="0.14.1"
 	    repo="ftp.gnome.org">
     </branch>
@@ -148,15 +138,15 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
   <distutils id="pyxdg">
     <branch repo="pyxdg" module="pyxdg-0.17.tar.gz" version="0.17"
-            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce"
-            md5sum="a086de99cc536095684d87f15594e4db" size="37372"/>
+            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce" size="37372"/>
   </distutils>
 
  <autotools id="xdg-utils">
    <branch module="xdg-utils-1.0.2.tgz" version="1.0.2" repo="xdg-utils"/>
  </autotools>
 
-  <autotools id="osmgpsmap">
+  <autotools id="osmgpsmap" autogenargs="--disable-introspection"
+	     autogen-sh="configure">
     <branch module="osm-gps-map/osm-gps-map-0.7.3.tar.gz" repo="stowers"
 	    version="0.7.3"/>
     <dependencies>
@@ -176,7 +166,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </dependencies>
   </distutils>
 
-  <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl">
+  <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --without-x --without-freetype2 --without-fontconfig --without-pangocairo --with-included-ltdl" autogen-sh="configure">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
     <dependencies>
       <dep package="pango"/>