diff --git a/templates/libXp-devel b/templates/libXp-devel
new file mode 120000
index 0000000000..39309c5a7c
--- /dev/null
+++ b/templates/libXp-devel
@@ -0,0 +1 @@
+libXp
\ No newline at end of file
diff --git a/templates/libXp/depends b/templates/libXp/depends
new file mode 100644
index 0000000000..9ff7c35b09
--- /dev/null
+++ b/templates/libXp/depends
@@ -0,0 +1,2 @@
+abi_depends=1.0.0
+api_depends=${abi_depends}
diff --git a/templates/libXp/devel.template b/templates/libXp/devel.template
new file mode 100644
index 0000000000..09106d0ba0
--- /dev/null
+++ b/templates/libXp/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXp-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXp
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	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 ${DESTDIR}/usr
+}
diff --git a/templates/libXp/template b/templates/libXp/template
index a8ce27d6fb..f090a156b7 100644
--- a/templates/libXp/template
+++ b/templates/libXp/template
@@ -1,16 +1,25 @@
 # Template build file for 'libXp'.
 pkgname=libXp
+sourcepkg=$pkgname
 version=1.0.0
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-pkgconfig_override="xp.pc"
 short_desc="X Print Service Extension Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=5d12e6bd1598654d1aa47a818047d1e0c6f50145
+checksum=7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
 long_desc="
  The X Print Service Extension Library (libXp) provides public APIs
  to allow client applications to render to non-display devices.
  It can query about printers, send jobs, and more.
 
  This is from the modular X.org."
+
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build xextproto
+Add_dependency build printproto
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libXext
+Add_dependency full libXau