diff --git a/templates/libx86-devel b/templates/libx86-devel
new file mode 120000
index 00000000000..763dc0a7bbf
--- /dev/null
+++ b/templates/libx86-devel
@@ -0,0 +1 @@
+libx86
\ No newline at end of file
diff --git a/templates/libx86/devel.template b/templates/libx86/devel.template
new file mode 100644
index 00000000000..56bba300d27
--- /dev/null
+++ b/templates/libx86/devel.template
@@ -0,0 +1,16 @@
+# Template file for 'libx86-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libx86-libs
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+}
diff --git a/templates/libx86/template b/templates/libx86/template
new file mode 100644
index 00000000000..b2e45163991
--- /dev/null
+++ b/templates/libx86/template
@@ -0,0 +1,16 @@
+# Template file for 'libx86'
+pkgname=libx86
+sourcepkg=$pkgname
+version=1.1
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+build_style=gnu_makefile
+make_build_args="BACKEND=x86emu"
+short_desc="Library for making real-mode x86 calls"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+long_desc="
+ A library to provide support for making real-mode x86 calls with an emulated
+ x86 processor."
+
+subpackages="devel"
+Add_dependency full glibc