diff --git a/hwloc.spec b/hwloc.spec
index aebbb3b..caa4871 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,10 +1,10 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   2.5.0
+Version:   2.9.0
 Release:   %autorelease
 License:   BSD
 URL:       http://www.open-mpi.org/projects/hwloc/
-Source0:   http://www.open-mpi.org/software/hwloc/v2.5/downloads/%{name}-%{version}.tar.bz2
+Source0:   https://download.open-mpi.org/release/hwloc/v2.9/hwloc-%{version}.tar.bz2
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: gcc
@@ -81,17 +81,14 @@ Requires:  %{name}-plugins%{?_isa} = %{version}-%{release}
 %autosetup -p1
 
 %build
-# The ./configure script will support --runstatedir= when generated with
-# autoconf 2.70. Until then, tell it about /run using the export:
-export runstatedir=/run
-%configure --enable-plugins --disable-silent-rules
+%configure --enable-plugins --disable-silent-rules --runstatedir=/run
 # Remove rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+%make_install
 
 # We don't ship .la files.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
diff --git a/sources b/sources
index b27debf..20cc07c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hwloc-2.5.0.tar.bz2) = 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
+SHA512 (hwloc-2.9.0.tar.bz2) = 45705d30c8a974c6afd998559cd1195e7e478cf01b669ad60c06baeac9d17c5cd163eb00ad12c2187889e9a7ea96ff6d5a3cb414e8e6de7f00a6fa10eb8c7507