diff --git a/blender.spec b/blender.spec
index 8c41492..f2505c9 100644
--- a/blender.spec
+++ b/blender.spec
@@ -188,12 +188,10 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
 # Fix all Python shebangs recursively in .
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
 
-mkdir cmake-make
-
 %build
-pushd cmake-make
 
-%cmake .. \
+%cmake . \
+    -B cmake-make
 %ifnarch %{ix86} x86_64
     -DWITH_RAYOPTIMIZATION=OFF \
 %endif
@@ -209,14 +207,11 @@ pushd cmake-make
     -DWITH_PYTHON_INSTALL=OFF \
     -DWITH_PYTHON_INSTALL_REQUESTS=OFF \
     -DWITH_PYTHON_SAFETY=ON 
-%make_build
-popd
+%cmake_build
 
 
 %install
-pushd cmake-make
-%make_install
-popd
+%cmake_install
 
 
 # Thumbnailer
@@ -278,6 +273,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %changelog
 * Thu Jul 09 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.83.2-2
 - Add openshadinglanguage dependency 
+- Use cmake macros for build and install
 - Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
 
 * Thu Jul 09 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.83.2-1