diff --git a/Makefile.am b/Makefile.am
index f871d46a8..36466ab9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -220,7 +220,7 @@ bundle: $(LIBICONV_HACK)
 	printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
 	> $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc
 	cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig
-	sed -e 's:@executable_path/../Resources:../..:g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
+	sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
 	cp -f $(LIBICONV_HACK) $(BUNDLEDIR)/Contents/Resources/lib/.
 	cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME) && cd -
 
diff --git a/build/macos/environment.sh b/build/macos/environment.sh
index 8d34ca02c..c2c672973 100644
--- a/build/macos/environment.sh
+++ b/build/macos/environment.sh
@@ -1,4 +1,5 @@
 export EXTRA_ARGS="--workdir $bundle_res"
-export GIO_EXTRA_MODULES="$bundle_res/lib/gio/modules"
-
+export GIO_EXTRA_MODULES="$bundle_lib/gio/modules"
+export PANGO_LIBDIR="$bundle_lib"
+export PANGO_SYSCONFDIR="$bundle_etc"