diff --git a/package/Config.in b/package/Config.in
index d310abc726..c9383269b2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -331,6 +331,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/hdparm/Config.in"
 endif
 	source "package/hwdata/Config.in"
+	source "package/hwloc/Config.in"
 	source "package/i2c-tools/Config.in"
 	source "package/input-event-daemon/Config.in"
 	source "package/input-tools/Config.in"
diff --git a/package/hwloc/Config.in b/package/hwloc/Config.in
new file mode 100644
index 0000000000..51aef4a0e0
--- /dev/null
+++ b/package/hwloc/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_HWLOC
+	bool "hwloc"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Portable Hardware Locality
+
+	  Provides a portable abstraction (across OS, versions,
+	  architectures, ...)  of the hierarchical topology of modern
+	  architectures, including NUMA memory nodes, sockets, shared
+	  caches, cores and simultaneous multithreading.
+
+	  http://www.open-mpi.org/projects/hwloc/
+
+comment "hwloc needs a toolchain w/ threads"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash
new file mode 100644
index 0000000000..53563dd8a4
--- /dev/null
+++ b/package/hwloc/hwloc.hash
@@ -0,0 +1,2 @@
+# From http://www.open-mpi.org/software/hwloc/v1.10/
+sha1	76291124e4638b2fbd4deb4cc3cd680e153077b5	hwloc-1.10.1.tar.bz2
diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk
new file mode 100644
index 0000000000..c1f6fea3be
--- /dev/null
+++ b/package/hwloc/hwloc.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# hwloc
+#
+################################################################################
+
+HWLOC_VERSION_MAJOR = 1.10
+HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1
+HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2
+HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads
+HWLOC_LICENSE = BSD-3c
+HWLOC_LICENSE_FILES = COPYING
+HWLOC_DEPENDENCIES = host-pkgconf
+
+HWLOC_CONF_OPTS = \
+	--disable-opencl \
+	--disable-cuda \
+	--disable-nvml \
+	--disable-gl \
+	--disable-cairo \
+	--disable-libxml2 \
+	--disable-doxygen
+
+ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y)
+HWLOC_CONF_OPTS += --enable-pci
+HWLOC_DEPENDENCIES += libpciaccess
+else
+HWLOC_CONF_OPTS += --disable-pci
+endif
+
+ifeq ($(BR2_PACKAGE_NUMACTL),y)
+HWLOC_CONF_OPTS += --enable-libnuma
+HWLOC_DEPENDENCIES += numactl
+else
+HWLOC_CONF_OPTS += --disable-libnuma
+endif
+
+$(eval $(autotools-package))