diff --git a/kf5.spec b/kf5.spec
index 67e5f4c..eeb7760 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,6 +1,6 @@
 Name:    kf5
 Version: 5.68.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Filesystem and RPM macros for KDE Frameworks 5
 License: BSD
 URL:     http://www.kde.org
@@ -21,7 +21,8 @@ Filesystem for KDE Frameworks 5.
 %package rpm-macros
 Summary: RPM macros for KDE Frameworks 5
 %if 0%{?fedora} || 0%{?rhel} > 7
-Requires: cmake >= 3
+# We need the correct macros
+Requires: cmake >= 3.18
 Requires: qt5-rpm-macros >= 5.11
 %else
 Requires: cmake3
@@ -80,6 +81,9 @@ sed -i \
 
 
 %changelog
+* Thu May 20 2021 Neal Gompa <ngompa13@gmail.com> - 5.68.0-4
+- Fix macros to work with new cmake for RHEL 8.4+
+
 * Wed Aug 26 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-3
 - Use something that actually works with el8's cmake-3.11
 
diff --git a/macros.kf5 b/macros.kf5
index 9ee8789..fb0b67f 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -15,7 +15,7 @@
 %_kf5_qmldir %_kf5_archdatadir/qml
 %_kf5_version @@KF5_VERSION@@
 
-%cmake_kf5 \
+%cmake_kf5 \\\
   %undefine __cmake_in_source_build \
   QTDIR="%{_qt5_prefix}" ; export QTDIR ; \
   PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \
@@ -23,7 +23,9 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-    %{!?__cmake_in_source_build:%__cmake_configure}%{?__cmake_in_source_build:%__cmake} \\\
+    %{__cmake} \\\
+    %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\
+    %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\
     -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
     -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
     -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\