diff --git a/CharLS.spec b/CharLS.spec
index c5ba75e..97df63b 100644
--- a/CharLS.spec
+++ b/CharLS.spec
@@ -38,18 +38,21 @@ CharLS Library Header Files and Link Libraries.
 %cmake -DBUILD_SHARED_LIBS:BOOL=ON\
 	-DCMAKE_BUILD_TYPE:STRING="Release"\
 	-DCMAKE_VERBOSE_MAKEFILE=ON\
-	-DBUILD_TESTING=ON .
+	-DBUILD_TESTING=ON
 
-%make_build
+%cmake_build
 
 
 %install
-%make_install
+%cmake_install
 
 
 %check
+pushd %{_vpath_builddir}
 # Enter a key + enter to finish
 echo "a" | ./charlstest
+popd
+
 
 %files
 %license License.txt