diff --git a/common/shlibs b/common/shlibs
index ebfb7888556..c008395c002 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2398,3 +2398,4 @@ libfbembed.so.2.5 libfbclient-2.5.5.26952_1
 libib_util.so libfbclient-2.5.5.26952_1
 libgds.so.0 libfbclient-2.5.5.26952_1
 libqxmpp.so.0 qxmpp-0.9.3_1
+libunwind.so.1 llvm-libunwind-3.8.0_1
diff --git a/srcpkgs/llvm-libunwind-devel b/srcpkgs/llvm-libunwind-devel
new file mode 120000
index 00000000000..6053fc96f5e
--- /dev/null
+++ b/srcpkgs/llvm-libunwind-devel
@@ -0,0 +1 @@
+llvm-libunwind
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind/template b/srcpkgs/llvm-libunwind/template
new file mode 100644
index 00000000000..ade2ac776af
--- /dev/null
+++ b/srcpkgs/llvm-libunwind/template
@@ -0,0 +1,30 @@
+# Template file for 'llvm-libunwind'
+pkgname=llvm-libunwind
+version=3.8.0
+revision=1
+build_style=cmake
+wrksrc="libunwind-${version}.src"
+hostmakedepends="cmake"
+makedepends="llvm"
+make_build_args="VERBOSE=1"
+short_desc="LLVM version of libunwind library"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
+homepage="http://llvm.org"
+license="BSD"
+distfiles="http://www.llvm.org/releases/${version}/libunwind-${version}.src.tar.xz"
+checksum=af3eaf39ecdc3b9e89863fb62e1aa3c135cfde7e9415424e4e396d7486a9422b
+
+post_install() {
+        vmkdir usr/include
+        vcopy include/* usr/include
+}
+
+llvm-libunwind-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="libunwind-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/llvm-libunwind/update b/srcpkgs/llvm-libunwind/update
new file mode 100644
index 00000000000..49e4f464a96
--- /dev/null
+++ b/srcpkgs/llvm-libunwind/update
@@ -0,0 +1 @@
+site="http://www.llvm.org/releases/download.html"