diff --git a/templates/libXmu-devel b/templates/libXmu-devel
new file mode 120000
index 00000000000..e676dde7e77
--- /dev/null
+++ b/templates/libXmu-devel
@@ -0,0 +1 @@
+libXmu
\ No newline at end of file
diff --git a/templates/libXmu/depends b/templates/libXmu/depends
new file mode 100644
index 00000000000..9dbd85baa2a
--- /dev/null
+++ b/templates/libXmu/depends
@@ -0,0 +1,2 @@
+abi_depends=1.0.4
+api_depends=${abi_depends}
diff --git a/templates/libXmu/devel.template b/templates/libXmu/devel.template
new file mode 100644
index 00000000000..30213415b6c
--- /dev/null
+++ b/templates/libXmu/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXmu-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXmu
+
+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/libXmu/template b/templates/libXmu/template
index 7fd0bd7fdb0..a986505afa4 100644
--- a/templates/libXmu/template
+++ b/templates/libXmu/template
@@ -1,4 +1,6 @@
+# Template build file for 'libXmu'.
 pkgname=libXmu
+sourcepkg=$pkgname
 version=1.0.4
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -15,7 +17,16 @@ long_desc="
 
  This is from the modular X.org project."
 
-shared_deps="libXt-1.0 libX11-1.1 libSM-1.0 libICE-1.0 libXext-1.0
- e2fsprogs-1.41"
-build_depends="pkg-config-0.23 xextproto-7.0 xtrans-1.2 ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build xextproto
+Add_dependency build xtrans
+Add_dependency build e2fsprogs
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libSM
+Add_dependency full libICE
+Add_dependency full libXext
+Add_dependency full libXt
+Add_dependency run e2fsprogs-libs