diff --git a/SPECS/kpatch.spec b/SPECS/kpatch.spec
index 07f962d..970b38e 100644
--- a/SPECS/kpatch.spec
+++ b/SPECS/kpatch.spec
@@ -2,7 +2,7 @@
 
 Name:		kpatch
 Version:	0.9.2
-Release:	5%{?dist}
+Release:	5.1%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -22,17 +22,22 @@ Patch100:	0100-kpatch-wait-for-module-ref-counts-on-unload.patch
 # kpatch-dnf backports
 Patch200:	0200-Makefile-set-install-permission-modes.patch
 
-Requires:	bash kmod binutils
-Recommends:	kpatch-dnf
-
-BuildArch:	noarch
-
-
 %description
 kpatch is a live kernel patch module manager.  It allows the user to manage
 a collection of binary kernel patch modules which can be used to dynamically
 patch the kernel without rebooting.
 
+%package -n kpatch-runtime
+Summary:        Dynamic kernel patch manager
+Requires:       bash kmod binutils
+Recommends:     kpatch-dnf
+Provides:       kpatch
+BuildArch:      noarch
+
+%description -n kpatch-runtime
+kpatch is a live kernel patch module manager.  It allows the user to manage
+a collection of binary kernel patch modules which can be used to dynamically
+patch the kernel without rebooting.
 
 %package -n kpatch-dnf
 Summary:	kpatch-patch manager plugin for DNF
@@ -40,12 +45,19 @@ Version:	%kpatch_dnf_ver
 BuildRequires:	python3-devel python3-dnf
 Requires:	python3-dnf python3-hawkey
 Provides:	kpatch-dnf
+BuildArch:	noarch
 
 %description -n kpatch-dnf
 kpatch-dnf is a DNF plugin that manages subscription to kpatch-patch updates.
 When enabled, kernel packages are automatically subscribed to corresponding
 kpatch-patch packages updates.
 
+%package -n kpatch-build
+Summary:        Build tool for kpatch
+BuildRequires:  gcc kernel-devel elfutils elfutils-devel
+%description -n kpatch-build
+kpatch-build is a tool to build patches for kpatch.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -59,19 +71,18 @@ cd kpatch-dnf-%{kpatch_dnf_ver}
 cd ..
 
 %build
-make -C man
+%make_build
 
-make -C kpatch-dnf-%{kpatch_dnf_ver}
+%make_build -C kpatch-dnf-%{kpatch_dnf_ver}
 
 %install
-make install PREFIX=/usr DESTDIR=%{buildroot} -C kpatch
-make install PREFIX=/usr DESTDIR=%{buildroot} -C man
-make install PREFIX=/usr DESTDIR=%{buildroot} -C contrib
-rm -f %{buildroot}/usr/share/man/man1/kpatch-build.1.gz
+make install PREFIX=/usr DESTDIR=%{buildroot}
+make install PREFIX=/usr DESTDIR=%{buildroot}
+make install PREFIX=/usr DESTDIR=%{buildroot}
 
 make install PREFIX=/usr DESTDIR=%{buildroot} PYTHONSITES=%{python3_sitelib} -C kpatch-dnf-%{kpatch_dnf_ver}
 
-%files
+%files -n kpatch-runtime
 %{_sbindir}/kpatch
 %{_usr}/lib/systemd/system/kpatch.service
 %doc %{_mandir}/man1/kpatch.1.gz
@@ -86,7 +97,17 @@ make install PREFIX=/usr DESTDIR=%{buildroot} PYTHONSITES=%{python3_sitelib} -C 
 echo "To enable automatic kpatch-patch subscription, run:"
 echo -e "\t$ dnf kpatch auto"
 
+%files -n kpatch-build
+%{_bindir}/kpatch-build
+%{_libexecdir}/%{name}
+%{_datadir}/%{name}
+%{_mandir}/man1/kpatch-build.1*
+
 %changelog
+* Wed May  5 2021 Davide Cavalca <dcavalca@fb.com> - 0.9.2-5.1
+- Add kpatch-build arched subpackage
+- Add kpatch-runtime noarch subpackage to provide kpatch
+
 * Mon Mar 15 2021 Artem Savkov <asavkov@redhat.com> 0.9.2-5
 - Cleanup /var/lib/kpatch directory on uninstall (rhbz#1930108)