diff --git a/kokkos.spec b/kokkos.spec
index 6962d7e..9523b66 100644
--- a/kokkos.spec
+++ b/kokkos.spec
@@ -1,7 +1,10 @@
+# Needed for EPEL8
+%undefine __cmake_in_source_build
+
 Name:           kokkos
 Version:        3.0.00
 %global         sover 3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kokkos C++ Performance Portability Programming
 # no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312
 ExcludeArch: i686 armv7hl
@@ -11,7 +14,7 @@ URL:            https://github.com/kokkos/kokkos
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
-BuildRequires:  cmake3 >= 3.0
+BuildRequires:  cmake >= 3.0
 BuildRequires:  hwloc-devel
 
 %global kokkos_desc \
@@ -38,9 +41,7 @@ This package contains the development files of %{name}.
 %setup -q
 
 %build
-mkdir build
-pushd build
-%{cmake3} \
+%cmake \
   -DKokkos_ENABLE_TESTS=On \
   -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \
   -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON \
@@ -48,15 +49,13 @@ pushd build
   -DKokkos_ENABLE_OPENMP=ON \
   -DKokkos_ENABLE_SERIAL=ON \
   -DKokkos_ENABLE_HWLOC=ON \
-  ..
-%make_build
-popd
+%cmake_build
 
 %install
-%make_install -C build
+%cmake_install
 
 %check
-make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
+%ctest %{?testargs}
 
 %files
 %doc README.md
@@ -71,6 +70,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_bindir}/nvcc_wrapper
 
 %changelog
+* Sat May 22 2021 Carl George <carl@george.computer> - 3.0.00-2
+- Rebuild for hwloc 2 (RHEL 8.4)
+
 * Thu Feb 27 2020 Christoph Junghans <junghans@votca.org> - 3.0.00-1
 - Version bump to 3.0.00