diff --git a/osx/README b/osx/README
new file mode 100644
index 0000000..3dfefac
--- /dev/null
+++ b/osx/README
@@ -0,0 +1,32 @@
+Building the OS X bundle
+========================
+
+Spek bundle uses packages provided by MacPorts. After installing MacPorts build all dependencies:
+
+$ sudo port install intltool
+$ sudo port install vala
+$ sudo port install pango +no_x11 +quartz
+$ sudo port install gtk2 +no_x11 +quartz
+$ sudo port install hicolor-icon-theme
+$ sudo port install ffmpeg +no_x11 +no_nonfree
+$ sudo port install ige-mac-integration
+$ sudo port install ige-mac-bundler
+
+Now make sure Spek builds by running `gmake && src/spek`.
+
+Note that these ports:
+
+  ige-mac-integration
+  ffmpeg
+  gtk2
+
+...require this line in their Portfile:
+
+  configure.ldflags-append -headerpad_max_install_names
+
+Also, by some reason MacPorts doesn't install /opt/local/lib/charset.alias,
+copy it from your favourite Unix flavour.
+
+After all dependencies are built just run:
+
+$ osx/bundle.sh
diff --git a/osx/launcher.sh b/osx/launcher.sh
index 008e6ba..4d81fc8 100755
--- a/osx/launcher.sh
+++ b/osx/launcher.sh
@@ -32,7 +32,7 @@ export GTK_PATH="$bundle_res"
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
-export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$bundle_etc"
 
 APP=name
 I18NDIR="$bundle_data/locale"
diff --git a/osx/spek.bundle b/osx/spek.bundle
index d1c3a71..b33b6ff 100644
--- a/osx/spek.bundle
+++ b/osx/spek.bundle
@@ -31,21 +31,16 @@
   <data dest="${bundle}/Contents/Resources/share">
     ${project}/bin/share
   </data>
-
-  <!-- Copy in the themes data. You may want to trim this to save space
-       in your bundle. -->
-  <!-- data>
+  <data>
     ${prefix}/share/themes
-  </data -->
-
+  </data>
   <data dest="${bundle}/Contents/Resources">
     ${project}/Spek.icns
   </data>
   <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
     ${project}/gtkrc
   </data>
-
-  <!-- icon-theme icons="auto">
-    Tango
-  </icon-theme -->
+  <icon-theme icons="auto">
+    hicolor
+  </icon-theme>
 </app-bundle>