diff --git a/templates/xf86-input-joystick-devel b/templates/xf86-input-joystick-devel
new file mode 120000
index 0000000000..b7d6dd3f6d
--- /dev/null
+++ b/templates/xf86-input-joystick-devel
@@ -0,0 +1 @@
+xf86-input-joystick
\ No newline at end of file
diff --git a/templates/xf86-input-joystick/depends b/templates/xf86-input-joystick/depends
new file mode 100644
index 0000000000..f1de44d64f
--- /dev/null
+++ b/templates/xf86-input-joystick/depends
@@ -0,0 +1,2 @@
+abi_depends=1.4.0
+api_depends=${abi_depends}
diff --git a/templates/xf86-input-joystick/devel.template b/templates/xf86-input-joystick/devel.template
new file mode 100644
index 0000000000..aa471e1001
--- /dev/null
+++ b/templates/xf86-input-joystick/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'xf86-input-joystick-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run xf86-input-joystick
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/input
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/xorg/modules/input/*.la \
+		${DESTDIR}/usr/lib/xorg/modules/input
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/templates/xf86-input-joystick/template b/templates/xf86-input-joystick/template
index 794ad6fff1..7085dc8ec1 100644
--- a/templates/xf86-input-joystick/template
+++ b/templates/xf86-input-joystick/template
@@ -1,13 +1,15 @@
 # Template build file for 'xf86-input-joystick'.
 pkgname=xf86-input-joystick
+sourcepkg=$pkgname
 version=1.4.0
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-short_desc="Joystick Input driver for Modular X.org"
+short_desc="Joystick Input driver for Xorg"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=789d9a3e1346ad24cc41c4f466de3eda08473772305c5e4bef2afa159e66c4c2
 long_desc="
- This is the Joystick Input driver for the modular X.org X11 server."
+ This is the Joystick Input driver for the Xorg X11 server."
 
+subpackages="devel"
 Add_dependency full glibc
 Add_dependency full xorg-server