diff --git a/apbs.spec b/apbs.spec
index 8a9f92b..c644de9 100644
--- a/apbs.spec
+++ b/apbs.spec
@@ -1,6 +1,3 @@
-# Force out of source build
-%undefine __cmake_in_source_build
-
 # Workaround for GCC-10
 %define _legacy_common_support 1
 
@@ -16,7 +13,7 @@
 Name: apbs
 Summary: Adaptive Poisson Boltzmann Solver
 Version: 3.0.0
-Release: 5%{datecommit}%{shortcommit}%{?dist}
+Release: 6%{datecommit}%{shortcommit}%{?dist}
 # iAPBS looks licensed with a LGPLv2+, APBS is released under BSD license.
 License: LGPLv2+ and BSD
 URL: https://www.poissonboltzmann.org/
@@ -26,6 +23,7 @@ Patch0: apbs-cmake.patch
 
 BuildRequires: gcc-c++
 BuildRequires: cmake3
+BuildRequires: make
 BuildRequires: doxygen
 BuildRequires: graphviz
 #BuildRequires: arpack-devel
@@ -33,6 +31,7 @@ BuildRequires: graphviz
 #BuildRequires: blas-devel
 BuildRequires: maloc-devel
 BuildRequires: python3-devel
+BuildRequires: python3-numpy
 BuildRequires: python3-sphinx
 BuildRequires: swig
 BuildRequires: tex(latex)
@@ -86,22 +85,18 @@ cp -p apbs/contrib/iapbs/COPYING apbs/contrib/iapbs/iapbs-COPYING
 cp -p %{SOURCE1} apbs/contrib/iapbs/iapbs-LGPLv2
 
 %build
-# Set the source directory
-%global _vpath_srcdir apbs
-
 export CFLAGS="%{build_cflags} -fopenmp -lm"
 export CXXFLAGS="%{build_cxxflags} -fopenmp -lm"
-%cmake3 -DBUILD_DOC:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release \
+%cmake3 -S apbs -B . -DBUILD_DOC:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release \
  -DENABLE_iAPBS:BOOL=ON -DENABLE_OPENMP:BOOL=ON -DENABLE_VERBOSE_DEBUG:BOOL=OFF \
  -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DENABLE_FETK:BOOL=OFF \
 %if %{with python}
- -DENABLE_PYTHON:BOOL=ON \
+ -DENABLE_PYTHON:BOOL=ON
 %endif
- %{nil}
-%cmake_build
+%make_build
 
 %install
-%cmake_install
+%make_install
 
 # tools
 for bin in %{buildroot}%{_bindir}/{coulomb,born,mgmesh,dxmath,mergedx2,mergedx,value,uhbd_asc2bin,smooth,dx2mol,dx2uhbd,similarity,multivalue,benchmark,analysis,del2dx,tensor2dx}; do
@@ -171,6 +166,9 @@ sed -i 's|../build/bin/apbs|../bin/apbs|g' ./apbs_tester.py
 %doc doc/_build/html
 
 %changelog
+* Fri Jan 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.0.0-6
+- Use cmake3 options
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild