diff --git a/templates/glitz-devel b/templates/glitz-devel
new file mode 120000
index 0000000000..f77693c209
--- /dev/null
+++ b/templates/glitz-devel
@@ -0,0 +1 @@
+glitz
\ No newline at end of file
diff --git a/templates/glitz/depends b/templates/glitz/depends
new file mode 100644
index 0000000000..ae1d2e9330
--- /dev/null
+++ b/templates/glitz/depends
@@ -0,0 +1,2 @@
+abi_depends=0.5.6
+api_depends=${abi_depends}
diff --git a/templates/glitz/devel.template b/templates/glitz/devel.template
new file mode 100644
index 0000000000..2161357ea2
--- /dev/null
+++ b/templates/glitz/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'glitz-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glitz
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	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/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/templates/glitz/template b/templates/glitz/template
index 3b76c5e79b..b8edad4a7a 100644
--- a/templates/glitz/template
+++ b/templates/glitz/template
@@ -1,14 +1,13 @@
 # Template build file for 'glitz'.
 pkgname=glitz
+sourcepkg=$pkgname
 version=0.5.6
-distfiles="
-http://cairographics.org/snapshots/$pkgname-$version.tar.gz"
+distfiles="http://cairographics.org/snapshots/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--with-x"
-pkgconfig_override="glitz.pc glitz-glx.pc"
-short_desc="OpenGL 2D graphics library and a backend for gl output in cairo"
+configure_args="--with-x --enable-glx"
+short_desc="OpenGL 2D graphics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=547ef1be273856942e0fa36c097c4acb367336b2
+checksum=132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471
 long_desc="
  Glitz is a portable 2D graphics library that uses OpenGL to render hardware
  accelerated graphics. It supports many of the latest OpenGL features, such as
@@ -19,3 +18,10 @@ long_desc="
  a general way for accelerating this imaging model. Glitz can be used as
  a stand-alone layer above OpenGL but is also designed to act as a backend for
  cairo, providing it with OpenGL accelerated output."
+
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libXt
+Add_dependency full MesaLib