diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index bd04e6fc0..9fe2a1e54 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<?xml version="1.0" encoding="utf-8"?>
 <app-bundle>
 
   <meta>
diff --git a/mac/gramps.launcher b/mac/gramps.launcher
index 767d1405d..949730c94 100755
--- a/mac/gramps.launcher
+++ b/mac/gramps.launcher
@@ -24,7 +24,9 @@ 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-3.0/gdk-pixbuf.loaders"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
+if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
+    export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
+fi
 export GI_TYPELIB_PATH="$bundle_lib/girepository-1.0"
 export GVBINDIR="$bundle_lib/graphviz"
 
diff --git a/mac/gramps.modules b/mac/gramps.modules
index 11534f46f..ec1378949 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -27,8 +27,6 @@
 	      href="git://github.com/"/>
   <repository type="tarball" name="graphviz"
 	      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"
 	      href="http://exiv2.org/"/>
   <repository type="tarball" name="pythonware"
@@ -127,9 +125,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
             md5sum="a086de99cc536095684d87f15594e4db" 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="xdg-utils">
+    <branch module="xdg-utils-1.0.2.tgz" version="1.0.2" repo="xdg-utils"/>
+  </autotools>
 
   <autotools id="osmgpsmap" skip-autogen="never"
 	     supports-non-srcdir-builds="no">
@@ -155,11 +153,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </autotools>
 
   <autotools id="gexiv2" autogen-sh="configure" supports-non-srcdir-builds="no"
-	     autogenargs="--enable-introspection"
+	     autogenargs="--enable-introspection --with-libtool=libtool"
 	     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">
-      <patch file='gexiv2-libtool.patch' strip="1"/>
+    <branch module="gexiv2/0.7/gexiv2-0.7.0.tar.xz"
+	    repo="ftp.gnome.org" version="0.7.0">
     </branch>
     <dependencies>
       <dep package="exiv2"/>