diff --git a/.gitignore b/.gitignore
index 193288c..6314646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ missing
 mkinstalldirs
 omf.make
 osx/Spek.app
+osx/Spek.dmg
 osx/bin
 po/*.gmo
 po/.intltool-merge-cache
diff --git a/osx/DS_Store b/osx/DS_Store
new file mode 100644
index 0000000..18409e7
Binary files /dev/null and b/osx/DS_Store differ
diff --git a/osx/bundle.sh b/osx/bundle.sh
index 186b66a..1322202 100755
--- a/osx/bundle.sh
+++ b/osx/bundle.sh
@@ -41,6 +41,29 @@ cp -Rp $DMG_APP $MOUNT_POINT
 
 find $MOUNT_POINT -type d -iregex '.*\.svn$' &>/dev/null | xargs rm -rf
 
-#pushd $MOUNT_POINT &>/dev/null
+cd $MOUNT_POINT
+ln -s /Applications " "
+cd ..
+
+cp DS_Store $MOUNT_POINT/.DS_Store
+
+echo "Detaching from disk image..."
+hdiutil detach $MOUNT_POINT -quiet
+
+mv $DMG_FILE $DMG_FILE.master
+
+echo "Creating distributable image..."
+hdiutil convert -quiet -format UDBZ -o $DMG_FILE $DMG_FILE.master
+
+#echo "Installing end user license agreement..."
+#hdiutil flatten -quiet $DMG_FILE
+#/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r dmg-data/license.r -a -o $DMG_FILE
+#hdiutil unflatten -quiet $DMG_FILE
+
+echo "Done."
+
+if [ ! "x$1" = "x-m" ]; then
+	rm $DMG_FILE.master
+fi
 
 cd ..
diff --git a/osx/spek.bundle b/osx/spek.bundle
index a8e78e3..d1c3a71 100644
--- a/osx/spek.bundle
+++ b/osx/spek.bundle
@@ -18,7 +18,10 @@
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
   </binary>
   <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-atsui.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
+  </binary>
+  <binary>
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
   </binary>
 
   <!-- translations name="gtk20">