diff --git a/hwloc.spec b/hwloc.spec
index 25b566d..2898746 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,10 +1,10 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.11.12
-Release:   3%{?dist}
+Version:   2.0.4
+Release:   1%{?dist}
 License:   BSD
 URL:       http://www.open-mpi.org/projects/hwloc/
-Source0:   http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-%{version}.tar.bz2
+Source0:   http://www.open-mpi.org/software/hwloc/v2.0/downloads/%{name}-%{version}.tar.bz2
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: gcc
@@ -114,7 +114,7 @@ rm %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service
 %endif
 
 %check
-LD_LIBRARY_PATH=$PWD/src/.libs make check
+LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 
 %ifarch %{ix86} x86_64
 %post
@@ -151,11 +151,13 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %files libs
 %{_mandir}/man7/%{name}*
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/%{name}.dtd
-%{_datadir}/%{name}/%{name}-valgrind.supp
+%{_datadir}/hwloc/hwloc.dtd
+%{_datadir}/hwloc/hwloc-valgrind.supp
+%{_datadir}/hwloc/hwloc2.dtd
+%{_datadir}/hwloc/hwloc2-diff.dtd
 %dir %{_pkgdocdir}/
 %{_pkgdocdir}/*[^c]
-%{_libdir}/libhwloc*so.5*
+%{_libdir}/libhwloc*so.15*
 
 %files gui
 %{_bindir}/lstopo
@@ -167,6 +169,9 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %{_libdir}/%{name}/hwloc*
 
 %changelog
+* Sat Aug 24 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.0.4-1
+- Update to latest version (#1663624)
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index f245fe8..4c08dda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hwloc-1.11.12.tar.bz2) = 5bc78e4178f14de21aa0648603841ff611d95fa66dbd5244970f4dd59e01276d1d8d944056680fdab6afbce10f6723dfe6d0f51845ed1c1065273e31011307fc
+SHA512 (hwloc-2.0.4.tar.bz2) = c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce