diff --git a/common/shlibs b/common/shlibs
index 5caf47d642c..131c27fa701 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2345,4 +2345,4 @@ libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
 libtolua.so tolua-5.2.0_1
-
+libhwloc.so.5 libhwloc-1.11.2_1
diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
new file mode 100644
index 00000000000..c8ede2d2acf
--- /dev/null
+++ b/srcpkgs/hwloc/template
@@ -0,0 +1,41 @@
+# Template file for 'hwloc'
+pkgname=hwloc
+version=1.11.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="cairo-devel ncurses-devel libxml2-devel libudev-devel"
+case "$XBPS_TARGET_ARCH" in
+	i686*|x86_64*) makedepends+=" libnuma-devel";;
+esac
+short_desc="Portable abstraction of hierarchical hardware architectures"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="BSD"
+homepage="http://www.open-mpi.org/projects/hwloc/"
+distfiles="http://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
+checksum=8c029b6b1638245837707bfa6c865f448af4e49e7d352335e019d818b51fecf8
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/doc
+}
+
+libhwloc_package() {
+	short_desc+=" - libraries"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vmove usr/share/hwloc/hwloc.dtd
+		vlicense COPYING
+	}
+}
+
+libhwloc-devel_package() {
+	short_desc+=" - development files"
+	depends="libhwloc>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/man/man3
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+		vmove usr/share/hwloc/hwloc-valgrind.supp
+	}
+}
diff --git a/srcpkgs/hwloc/update b/srcpkgs/hwloc/update
new file mode 100644
index 00000000000..aaec2d1f78c
--- /dev/null
+++ b/srcpkgs/hwloc/update
@@ -0,0 +1 @@
+pattern='hwloc v\K[\d.]+'
diff --git a/srcpkgs/libhwloc b/srcpkgs/libhwloc
new file mode 120000
index 00000000000..c0398db5afe
--- /dev/null
+++ b/srcpkgs/libhwloc
@@ -0,0 +1 @@
+hwloc
\ No newline at end of file
diff --git a/srcpkgs/libhwloc-devel b/srcpkgs/libhwloc-devel
new file mode 120000
index 00000000000..c0398db5afe
--- /dev/null
+++ b/srcpkgs/libhwloc-devel
@@ -0,0 +1 @@
+hwloc
\ No newline at end of file