diff --git a/cmake.spec b/cmake.spec
index e53c6cc..6deb724 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -76,7 +76,7 @@
 %endif
 
 # For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 1
+%global baserelease 2
 
 # Uncomment if building for EPEL
 #global name_suffix %%{major_version}
@@ -535,6 +535,9 @@ popd
 
 
 %changelog
+* Fri May 19 2023 Neal Gompa <ngompa@fedoraproject.org> - 3.26.4-2
+- macros: use the language build flag macros for compiler flags
+
 * Fri May 19 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.4-1
 - cmake-3.26.4
   Fixes rhbz#2208383
diff --git a/macros.cmake b/macros.cmake
index 63860a0..8e8575d 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -20,11 +20,11 @@
 %if 0%{?set_build_flags:1} \
   %set_build_flags \
 %else \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
-  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
-  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
+  CFLAGS="${CFLAGS:-%build_cflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%build_cxxflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%build_fflags}" ; export FFLAGS ; \
+  FCFLAGS="${FCFLAGS:-%build_fflags}" ; export FCFLAGS ; \
+  %{?build_ldflags:LDFLAGS="${LDFLAGS:-%build_ldflags}" ; export LDFLAGS ;} \
 %endif \
   %__cmake \\\
         %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\