diff --git a/templates/libXpm-devel b/templates/libXpm-devel
new file mode 120000
index 0000000000..4ae550f1e7
--- /dev/null
+++ b/templates/libXpm-devel
@@ -0,0 +1 @@
+libXpm
\ No newline at end of file
diff --git a/templates/libXpm/depends b/templates/libXpm/depends
new file mode 100644
index 0000000000..b4310676f3
--- /dev/null
+++ b/templates/libXpm/depends
@@ -0,0 +1,2 @@
+abi_depends=3.5.7
+api_depends=${abi_depends}
diff --git a/templates/libXpm/devel.template b/templates/libXpm/devel.template
new file mode 100644
index 0000000000..c1c7d234a4
--- /dev/null
+++ b/templates/libXpm/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXpm-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXpm
+
+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/libXpm/template b/templates/libXpm/template
index 7a8fa159e0..841108e0a3 100644
--- a/templates/libXpm/template
+++ b/templates/libXpm/template
@@ -1,4 +1,6 @@
+# Template build file for 'libXpm'.
 pkgname=libXpm
+sourcepkg=$pkgname
 version=3.5.7
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -11,7 +13,9 @@ long_desc="
 
  This libXpm is from the modular Xorg X11."
 
-shared_deps="libX11-1.1"
-build_depends="pkg-config-0.23 gettext-0.17 xproto-7.0 gettext-0.17
- ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build gettext
+Add_dependency build xproto
+Add_dependency full glibc
+Add_dependency full libX11