diff --git a/subscription-manager.spec b/subscription-manager.spec
index deebe28..9fbca8e 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -726,13 +726,12 @@ python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-versi
 
 %if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
 pushd src/dnf-plugins/product-id
-%cmake -DCMAKE_BUILD_TYPE="Release" .
-%make_build
+%cmake -DCMAKE_BUILD_TYPE="Release"
+%cmake_build
 popd
 %endif
 
 %install
-rm -rf %{buildroot}
 make -f Makefile install VERSION=%{version}-%{release} \
     PYTHON=%{__python} PREFIX=%{_prefix} \
     DESTDIR=%{buildroot} PYTHON_SITELIB=%{python_sitearch} \
@@ -752,7 +751,7 @@ make -f Makefile install VERSION=%{version}-%{release} \
 %if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
 pushd src/dnf-plugins/product-id
 mkdir -p %{buildroot}%{_libdir}/libdnf/plugins
-%make_install
+%cmake_install
 popd
 %endif