diff --git a/common/shlibs b/common/shlibs
index 71cd4c6df3c..3a207616bd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2455,3 +2455,4 @@ libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
 libR.so R-3.3.0_2
 libmarkdown.so.2 discount-2.2.0_3
+libkeystone.so.0 keystone-0.9_1
diff --git a/srcpkgs/keystone-devel b/srcpkgs/keystone-devel
new file mode 120000
index 00000000000..54e10b1b46c
--- /dev/null
+++ b/srcpkgs/keystone-devel
@@ -0,0 +1 @@
+keystone
\ No newline at end of file
diff --git a/srcpkgs/keystone/template b/srcpkgs/keystone/template
new file mode 100644
index 00000000000..8f7a29e3e85
--- /dev/null
+++ b/srcpkgs/keystone/template
@@ -0,0 +1,22 @@
+# Template file for 'keystone'
+pkgname=keystone
+version=0.9
+revision=1
+build_style=cmake
+configure_args='-DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD=all'
+hostmakedepends="cmake python"
+short_desc="Lightweight multi-platform, multi-architecture assembler framework"
+maintainer="Michael Gehring <mg@ebfe.org>"
+license="GPL-2"
+homepage="http://www.keystone-engine.org/"
+distfiles="https://github.com/keystone-engine/keystone/archive/${version}.tar.gz"
+checksum=94c58243dae1ec65a97d2ba02abb2323b4e5c82501eb7f8cfd85b460a0194157
+
+keystone-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}