diff --git a/templates/pango-devel b/templates/pango-devel
new file mode 120000
index 0000000000..f23a548cc8
--- /dev/null
+++ b/templates/pango-devel
@@ -0,0 +1 @@
+pango
\ No newline at end of file
diff --git a/templates/pango/depends b/templates/pango/depends
new file mode 100644
index 0000000000..bc6f698a27
--- /dev/null
+++ b/templates/pango/depends
@@ -0,0 +1,2 @@
+abi_depends=1.24.0
+api_depends=${abi_depends}
diff --git a/templates/pango/devel.template b/templates/pango/devel.template
new file mode 100644
index 0000000000..d99140635d
--- /dev/null
+++ b/templates/pango/devel.template
@@ -0,0 +1,23 @@
+# Template file for 'pango-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pango
+
+do_install()
+{
+	local lver="1.6.0"
+
+	mkdir -p ${DESTDIR}/usr/lib/pango/${lver}/modules
+	mkdir -p ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pango/${lver}/modules/*.la \
+		${DESTDIR}/usr/lib/pango/${lver}/modules
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/templates/pango/pango-docs-Makefile-in.diff b/templates/pango/pango-docs-Makefile-in.diff
deleted file mode 100644
index 8cada68294..0000000000
--- a/templates/pango/pango-docs-Makefile-in.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/Makefile.in.orig	2008-10-02 22:43:15.000000000 +0200
-+++ docs/Makefile.in	2008-10-02 22:43:24.000000000 +0200
-@@ -735,8 +735,6 @@
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- 	fi
- 
- uninstall-local:
diff --git a/templates/pango/template b/templates/pango/template
index 05607ddc55..e605a451b9 100644
--- a/templates/pango/template
+++ b/templates/pango/template
@@ -1,15 +1,13 @@
 # Template build file for 'pango'.
 pkgname=pango
-version=1.22.0
-patch_files="$pkgname-docs-Makefile-in.diff"
-distfiles="
-http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=1.24.1
+distfiles="${GNOME_SITE}/pango/1.24/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="pango.pc pangocairo.pc pangoft2.pc pangox.pc pangoxft.pc"
+configure_args="--localstatedir=/var"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=26bf28a0d7d23dd65e98ee5d2cfea424c15c1e41
+checksum=e00c343dd14c23b89a6767f87d31d4246c14739c57c0174008a86b33174b9ab2
 long_desc="
  Pango is a library for layout and rendering of text, with an emphasis
  on internationalization. Pango can be used anywhere that text layout
@@ -32,5 +30,18 @@ long_desc="
  PangoLayout, a high level driver for laying out entire blocks of text,
  and routines to assist in editing internationalized text."
 
-# The pango.modules file needs to be updated once installed.
-postinstall_helpers="pango-update-modules.sh"
+subpackages="devel"
+triggers="pango-modules"
+
+Add_dependency build pkg-config
+Add_dependency full glibc
+Add_dependency full glib
+Add_dependency full zlib
+Add_dependency full fontconfig
+Add_dependency full freetype
+Add_dependency full cairo
+Add_dependency full libX11
+Add_dependency full libXt
+Add_dependency full libXft
+Add_dependency full libXrender
+# XXX Add missing dependency libthai.