diff --git a/templates/libglade-devel b/templates/libglade-devel
new file mode 120000
index 0000000000..5fa046e2db
--- /dev/null
+++ b/templates/libglade-devel
@@ -0,0 +1 @@
+libglade
\ No newline at end of file
diff --git a/templates/libglade/depends b/templates/libglade/depends
new file mode 100644
index 0000000000..b1dc709d02
--- /dev/null
+++ b/templates/libglade/depends
@@ -0,0 +1,2 @@
+abi_depends=2.6.4
+api_depends=${abi_depends}
diff --git a/templates/libglade/devel.template b/templates/libglade/devel.template
new file mode 100644
index 0000000000..5a07b016e3
--- /dev/null
+++ b/templates/libglade/devel.template
@@ -0,0 +1,21 @@
+# Template file for 'libglade-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libglade
+Add_dependency run python
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/templates/libglade/template b/templates/libglade/template
index 1a39d7ac23..4a7f83f831 100644
--- a/templates/libglade/template
+++ b/templates/libglade/template
@@ -1,15 +1,13 @@
 # Template build file for 'libglade'.
 pkgname=libglade
-version=2.6.3
-distfiles="
-http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=2.6.4
+distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--without-xml-catalog"
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="libglade-2.0.pc"
 short_desc="Runtime interpreter for GLADE GUI files"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=73b00932c5a5ea1dfa25b2677783f5e52202ce8e
+checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
 long_desc="
  Libglade is a library that performs a similar job to the C source
  output routines in the GLADE user interface builder. Whereas GLADE's
@@ -21,8 +19,14 @@ long_desc="
  with support for keyboard accelerators and automatic signal
  connection."
 
-# Register DTDs with xmlcatmgr.
-xml_entries="system http://glade.gnome.org/glade-2.0.dtd
-$PKGFS_DESTDIR/$pkgname-$version/share/xml/libglade/glade-2.0.dtd"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build python
+Add_dependency full glibc
+Add_dependency full xmlcatmgr
+Add_dependency full gtk+
 
-postinstall_helpers="xml-catalogs.sh"
+# Register DTDs with xmlcatmgr.
+triggers="xml-catalog"
+xml_entries="system http://glade.gnome.org/glade-2.0.dtd
+ /usr/share/xml/libglade/glade-2.0.dtd"