diff --git a/Makefile.am b/Makefile.am
index 64021f43f..edcb87dd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,10 +28,10 @@ SUBDIRS = \
 	desktop
 
 osx-bundle:
-	@SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@@PACKAGE_DEBUG@ @AEGISUB_VERSION_DATA@
+	@SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@@PACKAGE_DEBUG@ @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR)
 
 osx-dmg:
-	@SHELL@ scripts/osx-dmg.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@@PACKAGE_DEBUG@ "@PACKAGE_TARNAME@ @PACKAGE_VERSION@"
+	@SHELL@ scripts/osx-dmg.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@@PACKAGE_DEBUG@ "@PACKAGE_TARNAME@-@PACKAGE_VERSION@"
 
 EXTRA_DIST = \
 	intltool-extract.in \
diff --git a/scripts/osx-bundle.sh b/scripts/osx-bundle.sh
index 5e482244c..fa987f211 100755
--- a/scripts/osx-bundle.sh
+++ b/scripts/osx-bundle.sh
@@ -4,6 +4,8 @@ PKG_DIR=${1}.app
 SKEL_DIR="packages/osx_bundle"
 AEGISUB_VERSION_DATA="${2}"
 SRCDIR=`pwd`
+HOME_DIR=`echo ~`
+
 if test -z "${CC}"; then
   CC="cc"
 fi
@@ -39,6 +41,21 @@ cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf |sed -f scripts/osx-bund
 cp ${SKEL_DIR}/Contents/Resources/etc/fonts/conf.d/*.conf ${PKG_DIR}/Contents/Resources/etc/fonts/conf.d
 cat ${SKEL_DIR}/Contents/Info.plist |sed -f scripts/osx-bundle.sed > ${PKG_DIR}/Contents/Info.plist
 
+
+echo
+echo "---- Copying dictionaries ----"
+if test -z ${DICT_DIR}; then
+  DICT_DIR="${HOME_DIR}/dict"
+fi
+
+if test -d "${DICT_DIR}"; then
+  cp -v ${DICT_DIR}/* ${PKG_DIR}/Contents/SharedSupport/dictionaries
+else
+  echo "WARNING: Dictionaries not found, please set $$DICT_DIR to a directiory"
+  echo "         where the *.aff and *.dic files can be found"
+fi
+
+
 echo
 echo "---- Copying automation/ files ----"
 cd automation