diff --git a/common/shlibs b/common/shlibs
index 643ebae3b4c..c6e7222902e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -85,7 +85,7 @@ libgobject-2.0.so.0 glib-2.18.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
-libpangoxft-1.0.so.0 pango-1.24.0_1
+libpangoxft-1.0.so.0 pango-xft-1.36.3_2
 libpangox-1.0.so.0 pangox-compat-0.0.2_1
 libpango-1.0.so.0 pango-1.24.0_1
 libcairo.so.2 cairo-1.8.6_1
diff --git a/srcpkgs/pango-xft b/srcpkgs/pango-xft
new file mode 120000
index 00000000000..f23a548cc82
--- /dev/null
+++ b/srcpkgs/pango-xft
@@ -0,0 +1 @@
+pango
\ No newline at end of file
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 1cbf5d48bdd..6f7903c36da 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,7 +1,7 @@
 # Template build file for 'pango'.
 pkgname=pango
 version=1.36.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-included-modules=basic-fc"
 hostmakedepends="libtool pkg-config glib-devel"
@@ -36,9 +36,20 @@ pre_configure() {
 	libtoolize -f
 }
 
+pango-xft_package() {
+	short_desc+=" - X font rendering"
+	pkg_install() {
+		vmove usr/lib/libpangoxft*.so.*
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0/PangoXft-1.0.typelib
+		fi
+	}
+}
+
 pango-devel_package() {
-	depends="libglib-devel>=2.38 cairo-devel fontconfig-devel freetype-devel
-		libXft-devel harfbuzz-devel pango>=${version}_${revision}"
+	depends="libglib-devel>=2.38 cairo-devel fontconfig-devel libXft-devel
+		harfbuzz-devel pango-xft>=${version}_${revision}
+		pango>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -47,5 +58,6 @@ pango-devel_package() {
 			vmove "usr/share/gir-*"
 		fi
 		vmove usr/share/gtk-doc
+		vmove usr/lib/*.so
 	}
 }