diff --git a/mac/Info.plist b/mac/Info.plist
index ef1f353b4..a2c109583 100755
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Trunk, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
+    <string>4.0.0-alpha1, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -15,13 +15,13 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundlePackageType</key>
-    <string>APPL</string>
+    <string>4.0.0-alpha1</string>
     <key>CFBundleShortVersionString</key>
     <string>Trunk</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Trunk</string>
+    <string>4.0.0-alpha1</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..e5ff19f1c 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -6,6 +6,9 @@
     <destination overwrite="yes">${env:HOME}/Desktop</destination>
     <run-install-name-tool/>
     <launcher-script>${project}/gramps.launcher</launcher-script >
+    <!-- Indicate the active gtk version to use. This is needed only
+	 for gtk+-3.0 projects. -->
+    <gtk>gtk+-3.0</gtk>
   </meta>
 
   <plist>${project}/Info.plist</plist>
@@ -27,23 +30,18 @@
   <binary>
     ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/
   </binary>
-<!-- Copy in the theme engines. -->
+<!-- Copy in the input methods. Dunno if they actually work with OSX. -->
   <binary>
-    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
   </binary>
 
 <!-- And the print backends -->
   <binary>
-    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
   </binary>
 
   <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
-  </binary>
-
-  <!-- Copy in libpyglib, which will pull in other dependencies we need -->
-  <binary>
-    ${prefix}/lib/libpyglib-2.0-python.0.dylib
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
   </binary>
 
   <binary recurse="True">
@@ -59,15 +57,7 @@
   </binary-->
 
   <binary>
-    ${prefix}/lib/libgoocanvas.3.dylib
-  </binary>
-
-  <binary>
-    ${prefix}/lib/libgtkmacintegration.0.dylib
-  </binary>
-
-  <binary>
-    ${prefix}/lib/libart_lgpl_2.2.dylib
+    ${prefix}/lib/libgtkmacintegration.2.dylib
   </binary>
 
   <binary>
@@ -87,7 +77,7 @@
   </binary>
 
   <binary>
-     ${prefix}/lib/libosmgpsmap.2.dylib
+     ${prefix}/lib/libosmgpsmap.3.dylib
   </binary>
 
   <binary>
@@ -110,7 +100,27 @@
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
        library/program under the indicated directory and copy them.-->
-  <translations name="gtk20">
+  <translations name="gtk30">
+    ${prefix}/share/locale
+  </translations>
+
+  <translations name="gtk30-properties">
+    ${prefix}/share/locale
+  </translations>
+
+  <translations name="glib20">
+    ${prefix}/share/locale
+  </translations>
+
+   <translations name="gdk-pixbuf">
+    ${prefix}/share/locale
+  </translations>
+
+  <translations name="atk10">
+    ${prefix}/share/locale
+  </translations>
+
+  <translations name="gtkspell3">
     ${prefix}/share/locale
   </translations>
 
@@ -121,6 +131,10 @@
 
   <!-- We have to pull in the python modules, which are mixed python
        and loadable modules.  -->
+  <data>
+    ${prefix}/share/glib-2.0/schemas
+  </data>
+
   <data recurse="True">
     ${prefix}/lib/python2.7/*.py
   </data>
@@ -133,10 +147,6 @@
     ${prefix}/include/python2.7/pyconfig.h
   </data>
 
-  <data>
-    ${prefix}/share/gramps/
-  </data>
-
   <!--data>
     ${prefix}/share/webkit-1.0/
   </data-->
@@ -149,6 +159,18 @@
     ${prefix}/share/mime/
   </data>
 
+  <data recurse="True">
+    ${prefix}/lib/python2.7/site-packages/gramps/*.glade
+  </data>
+
+  <data>
+    ${prefix}/lib/python2.7/site-packages/gramps/data/
+  </data>
+
+  <data recurse="True">
+    ${prefix}/lib/python2.7/site-packages/gramps/images/*.png
+  </data>
+
   <data>
     ${prefix}/share/mime-info/
   </data>
@@ -171,15 +193,7 @@
     ${project}/gramps.icns
   </data>
 
-  <!-- This is where theme commands go. You can copy them in from your
-       theme of choice if they provide and example, or you can just
-       change the source path. -->
-
-  <data dest="${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc">
-    ${project}/gtkrc
-  </data>
-
-  <data dest="${bundle}/Contents/Resources/share/gramps/data/gramps.accel">
+  <data dest="${bundle}/Contents/Resources/lib/python2.7/site-packages/gramps/data/gramps.accel">
     ${project}/gramps.accel
   </data>
 
diff --git a/mac/gramps.launcher b/mac/gramps.launcher
index 54d48e548..ebe4b9a48 100755
--- a/mac/gramps.launcher
+++ b/mac/gramps.launcher
@@ -21,9 +21,8 @@ export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-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"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
 export GVBINDIR="$bundle_lib/graphviz"
 
 
@@ -31,10 +30,8 @@ export GVBINDIR="$bundle_lib/graphviz"
 PYVER=2.7
 export PYTHON="$bundle_contents/MacOS/python"
 export PYTHONHOME="$bundle_res"
-PYTHONPATH="$bundle_lib/python$PYVER/site-packages/pyenchant-1.6.1-py$PYVER.egg:$PYTHONPATH"
-export PYTHONPATH="$bundle_lib/python$PYVER/site-packages/gtk-2.0:$PYTHONPATH"
 
-export GRAMPSDIR="$bundle_data"/gramps
+export GRAMPSDIR="$bundle_lib/python$PYVER/site-packages/gramps"
 export GRAMPSI18N="$bundle_data"/locale
 export GRAMPSHOME="$HOME/Library/Application Support"
 
@@ -42,5 +39,5 @@ export GRAMPSHOME="$HOME/Library/Application Support"
 if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
     shift 1
 fi
-exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@"
+exec "$PYTHON" -O "$bundle_contents/MacOS/Gramps-bin" "$@"
 
diff --git a/mac/gramps.modules b/mac/gramps.modules
index 4cb2c2e63..1760619f2 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -59,8 +59,8 @@ 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"/-->
+  <!--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"/>
 
 
 
@@ -81,6 +81,24 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </after>
   </distutils>
 
+  <distutils id="gramps-40">
+    <branch module="gramps/gramps-4.0.0-alpha1.tar.gz" version="4.0.0-alpha1"
+	    repo="sourceforge"/>
+    <dependencies>
+      <dep package="meta-gtk-osx-python-gtk3"/>
+      <dep package="librsvg"/>
+      <dep package="shared-mime-info"/>
+      <dep package="hunspell"/>
+      <dep package="gtkspell3"/>
+      <dep package="osmgpsmap"/>
+      <dep package="graphviz"/>
+      <dep package="pil"/>
+    </dependencies>
+    <after>
+      <dep package="pyexiv2"/>
+    </after>
+  </distutils>
+
   <distutils id="gramps-addons-svn">
     <branch module="gramps-addons/trunk/contrib"
 	    repo="gramps-addons"/>
@@ -127,17 +145,19 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 	    version="0.7.3"/>
     <dependencies>
       <dep package="osmgpsmap"/>
-       <dep package="pygtk"/>
-       <dep package="pycairo-python2.6"/>
-      <dep package="pygobject"/>
   </dependencies>
+  <after>
+    <dep package="pygtk"/>
+    <dep package="pygobject"/>
+    <dep package="pygobject3"/>
+    <dep package="pycairo-python2.6"/>
+    <dep package="pycairo-python3"/>
+  </after>
   </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 --with-pangocairo=yes --with-freetype2=no --with-fontconfig=no --with-included-ltdl=yes">
+  <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --with-pangocairo=no --with-freetype2=no --with-fontconfig=no --with-included-ltdl=yes">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
     <dependencies>
-      <dep package="meta-gtk-osx-freetype"/>
-      <dep package="pango"/>
       <dep package="zlib"/>
     </dependencies>
   </autotools>