diff --git a/molecules/e17.common b/molecules/e17.common
index b120190..a019690 100644
--- a/molecules/e17.common
+++ b/molecules/e17.common
@@ -52,6 +52,7 @@ packages_to_add:
 	app-misc/anaconda-runtime-gui,
 	app-text/epdfview,
 	app-text/pastebunz,
+	dev-libs/fribidi,
 	gnome-extra/nm-applet,
 	lxde-base/lxdm,
         media-fonts/ttf-bitstream-vera,
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 45dead5..9d9603a 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -209,6 +209,13 @@ if [ -d "/var/run/mysqld" ]; then
 	chown mysql:mysql /var/run/mysqld -R
 fi
 
+# Make sure that pango stuff is properly configured
+# It happens with E17 lives, for sure there is something broken
+# somewhere.
+if [ -x "/usr/bin/pango-querymodules" ]; then
+	/usr/bin/pango-querymodules > "/etc/pango/$(uname -m)-pc-linux-gnu/pango.modules"
+fi
+
 # Setup SAMBA config file
 if [ -f /etc/samba/smb.conf.default ]; then
 	cp -p /etc/samba/smb.conf.default /etc/samba/smb.conf