diff --git a/x11-libs/pango/pango-1.36.8.recipe b/x11-libs/pango/pango-1.36.8.recipe
index 2f31fcc9a..932ab3ff1 100644
--- a/x11-libs/pango/pango-1.36.8.recipe
+++ b/x11-libs/pango/pango-1.36.8.recipe
@@ -23,6 +23,7 @@ GNU LGPL v2.1
 "
 SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-$portVersion.tar.xz"
 CHECKSUM_SHA256="18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07"
+PATCHES="pango-$portVersion.patchset"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -46,6 +47,7 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libharfbuzz$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	# required by cairo
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libpixman_1$secondaryArchSuffix
@@ -67,11 +69,15 @@ BUILD_REQUIRES="
 	devel:libfreetype$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libharfbuzz$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
 	# required by cairo
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libpixman_1$secondaryArchSuffix
 	# required by fontconfig
 	devel:libxml2$secondaryArchSuffix
+	# required by harfbuzz
+	devel:libgraphite2$secondaryArchSuffix
+	lib:libgcc_s$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -83,13 +89,12 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:gtkdocize
-	"
-GLOBAL_WRITABLE_FILES="
-	settings/pango/pango.modules auto-merge
+	cmd:find
 	"
 
 BUILD()
 {
+	libtoolize --force --copy --install
 	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
diff --git a/x11-libs/pango/patches/pango-1.36.8.patchset b/x11-libs/pango/patches/pango-1.36.8.patchset
new file mode 100644
index 000000000..1c7efa455
--- /dev/null
+++ b/x11-libs/pango/patches/pango-1.36.8.patchset
@@ -0,0 +1,27 @@
+From 89d8edabf98747fa30d6a6f7989d0a66e189a302 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Mon, 20 Apr 2015 18:16:55 +0200
+Subject: Pretend we are cross-compiling
+
+Workarounds some library path and libtool mixups.
+
+diff --git a/modules/Makefile.am b/modules/Makefile.am
+index 73b42f4..ede826d 100644
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -14,12 +14,7 @@ EXTRA_DIST =		\
+ CLEANFILES =		\
+ 	pango.modules
+ 
+-if CROSS_COMPILING
+ RUN_QUERY_MODULES_TEST=false
+-else
+-RUN_QUERY_MODULES_TEST=true
+-all-local: pango.modules
+-endif
+ 
+ install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
+ 	@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then 	\
+-- 
+2.2.2
+