diff --git a/packages/x11/toolkits/harfbuzz/install b/packages/x11/toolkits/harfbuzz/install
index 95cf37ffa2..dce0bc6356 100755
--- a/packages/x11/toolkits/harfbuzz/install
+++ b/packages/x11/toolkits/harfbuzz/install
@@ -25,17 +25,11 @@
 MODULE_VERSION=`pkg-config pango --variable=pango_module_version`
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/$1/.libs/libpango*.so* $INSTALL/usr/lib
-    rm -rf $INSTALL/usr/lib/libpango*.so*T
-
-mkdir -p $INSTALL/usr/lib/pango/$MODULE_VERSION/modules
-  cp -P $PKG_BUILD/modules/*/.libs/*.so \
-    $INSTALL/usr/lib/pango/$MODULE_VERSION/modules
+  cp -P $PKG_BUILD/src/.libs/libharfbuzz.so* $INSTALL/usr/lib
+    rm -rf $INSTALL/usr/lib/libharfbuzz.so*T
 
 mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/$1/.libs/pango-querymodules $INSTALL/usr/bin
+  cp $PKG_BUILD/util/.libs/hb-ot-shape-closure $INSTALL/usr/bin
+  cp $PKG_BUILD/util/.libs/hb-shape $INSTALL/usr/bin
+  cp $PKG_BUILD/util/.libs/hb-view $INSTALL/usr/bin
 
-mkdir -p $INSTALL/etc/pango
-  cp $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango
-  cp $PKG_DIR/config/pango.modules $INSTALL/etc/pango
-  cp $PKG_DIR/config/pangorc $INSTALL/etc/pango
diff --git a/packages/x11/toolkits/pango/config/pango.modules b/packages/x11/toolkits/pango/config/pango.modules
index dc8a6183fb..2494e6cc12 100644
--- a/packages/x11/toolkits/pango/config/pango.modules
+++ b/packages/x11/toolkits/pango/config/pango.modules
@@ -1,35 +1,18 @@
 # Pango Modules file
 # Automatically generated file, do not edit
 #
-# ModulesPath = /usr/lib/pango/1.6.0/modules
+# ModulesPath = /usr/lib/pango/1.8.0/modules
 #
-/usr/lib/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
-/usr/lib/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
-/usr/lib/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:
-/usr/lib/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
-/usr/lib/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*
-/usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
-/usr/lib/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
-/usr/lib/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
-/usr/lib/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
-/usr/lib/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
-/usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
+/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
+/usr/lib/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common:
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
+
diff --git a/packages/x11/toolkits/pango/config/pangorc b/packages/x11/toolkits/pango/config/pangorc
index da60cdad42..d37ff990ad 100644
--- a/packages/x11/toolkits/pango/config/pangorc
+++ b/packages/x11/toolkits/pango/config/pangorc
@@ -1,6 +1,6 @@
 [Pango]
 ModuleFiles = /etc/pango/pango.modules
-ModulesPath = /usr/lib/pango/1.6.0/modules
+ModulesPath = /usr/lib/pango/1.8.0/modules
 
 [PangoX]
 AliasFiles = /etc/pango/pangox.aliases
diff --git a/packages/x11/toolkits/pango/install b/packages/x11/toolkits/pango/install
index 95cf37ffa2..ba5198988e 100755
--- a/packages/x11/toolkits/pango/install
+++ b/packages/x11/toolkits/pango/install
@@ -36,6 +36,6 @@ mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/$1/.libs/pango-querymodules $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc/pango
-  cp $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango
+#  cp $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango
   cp $PKG_DIR/config/pango.modules $INSTALL/etc/pango
   cp $PKG_DIR/config/pangorc $INSTALL/etc/pango