diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fedea126..4a213e3a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 # set version of the project
 set(LIBYANG_MAJOR_VERSION 5)
 set(LIBYANG_MINOR_VERSION 8)
-set(LIBYANG_MICRO_VERSION 3)
+set(LIBYANG_MICRO_VERSION 4)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 
 # set version of the library
diff --git a/distro/pkg/rpm/libyang.spec b/distro/pkg/rpm/libyang.spec
index 4b9516436..44909bc56 100644
--- a/distro/pkg/rpm/libyang.spec
+++ b/distro/pkg/rpm/libyang.spec
@@ -70,11 +70,8 @@ written (and providing API) in C.
 %else
   %cmake -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
   %cmake_build
-  %if "x%{?suse_version}" == "x"
-    cd %{__cmake_builddir}
-  %endif
 %endif
-make doc
+%cmake_build --target doc
 
 %check
 %if ( 0%{?rhel} == 0 ) || 0%{?rhel} > 7