diff --git a/README.md b/README.md
index 5ce51a7..7a59295 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ E.g. build a src.rpm with:
 
     $ rpmbuild -bs \
                --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \
-               --define "dist .el8" SPECS/nfs-ganesha.spec
+               --define "dist .el9s" SPECS/nfs-ganesha.spec
 
 
 To build:
@@ -41,12 +41,10 @@ e9c6a6a482b8e46117c2a6c37b50c569bd62d92e  SOURCES/nfs-ganesha-3.5.tar.gz
 commit 29f19456be12986e86392652331e3a56ff0a88a0
 
 5. build
-    $ cbs build storage8-nfsganesha-3-el8 git+https://git.centos.org/rpms/nfs-ganesha.git#29f19456be12986e86392652331e3a56ff0a88a0
-
-
+    $ cbs build storage9s-nfsganesha-3-el9s git+https://git.centos.org/rpms/nfs-ganesha.git#29f19456be12986e86392652331e3a56ff0a88a0
 
 
 And the packages with
 
-    $ cbs build [--scratch] storage8-nfsganesha-3-el8 nfs-ganesha*.el8.src.rpm
+    $ cbs build [--scratch] storage9s-nfsganesha-3-el9s nfs-ganesha*.el8.src.rpm
 
diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec
index 43483fc..502d611 100644
--- a/SPECS/nfs-ganesha.spec
+++ b/SPECS/nfs-ganesha.spec
@@ -497,7 +497,7 @@ Development headers and auxiliary files for developing with %{name}.
 %setup -q -n %{name}-%{version}%{?dev:-%{dev}}
 
 %build
-cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
+cd src && %{cmake} . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DBUILD_CONFIG=rpmbuild				\
 	-DUSE_FSAL_NULL=%{use_fsal_null}		\
 	-DUSE_FSAL_MEM=%{use_fsal_mem}			\
@@ -524,11 +524,14 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DRPCBIND=%{use_rpcbind}			\
 	-D_MSPAC_SUPPORT=%{use_mspac_support}		\
 	-DSANITIZE_ADDRESS=%{use_sanitize_address}	\
+	-DCMAKE_COLOR_MAKEFILE:BOOL=OFF			\
 %if %{with jemalloc}
 	-DALLOCATOR=jemalloc
 %endif
 
-make VERBOSE=1 %{?_smp_mflags} || make %{?_smp_mflags} || make
+export VERBOSE=1
+export GCC_COLORS=
+%cmake_build
 
 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 make -C selinux -f /usr/share/selinux/devel/Makefile ganesha.pp
@@ -601,7 +604,7 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g
 install -m 644 config_samples/gpfs.ganesha.exports.conf	%{buildroot}%{_sysconfdir}/ganesha
 %endif
 
-make DESTDIR=%{buildroot} install
+%cmake_install
 
 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 install -d %{buildroot}%{_selinux_store_path}/packages