diff --git a/.gitignore b/.gitignore
index 40d972e..bb853e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SOURCES/kpatch-dnf-v0.3.tar.gz
 SOURCES/v0.9.3.tar.gz
+SOURCES/v0.9.4.tar.gz
diff --git a/.kpatch.metadata b/.kpatch.metadata
index d994ee3..fbdea8b 100644
--- a/.kpatch.metadata
+++ b/.kpatch.metadata
@@ -1,2 +1,2 @@
 6e905f1a910777a0a5f7a41d22331f6508cbd260 SOURCES/kpatch-dnf-v0.3.tar.gz
-2b781cf5acd4869510950696e610b747ed508913 SOURCES/v0.9.3.tar.gz
+1f080a31cc087b41cb4d37c514819444bd8a75ae SOURCES/v0.9.4.tar.gz
diff --git a/SPECS/kpatch.spec b/SPECS/kpatch.spec
index 78432be..5ee5457 100644
--- a/SPECS/kpatch.spec
+++ b/SPECS/kpatch.spec
@@ -1,8 +1,8 @@
 %define kpatch_dnf_ver	0.3
 
 Name:		kpatch
-Version:	0.9.3
-Release:	3%{?dist}
+Version:	0.9.4
+Release:	1.6%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -16,7 +16,7 @@ Patch0:		0001-contrib-disable-upstart-kpatch.conf-install.patch
 Patch1:		0002-kpatch-clarify-unload-unsupport.patch
 
 # Upstream backports (inactive -- for future reference)
-Patch100:	0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch
+#Patch100:	0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch
 
 # kpatch-dnf backports (inactive -- for future reference)
 #Patch200:	0200-foo-bar-etcetera.patch
@@ -26,12 +26,23 @@ 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
+Suggests:	kpatch-dnf
+Provides:	kpatch = %{version}-%{release}
+Obsoletes:	kpatch < 0.9.4-1.6
+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
@@ -45,12 +56,18 @@ 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
 %patch1 -p1
 # Use this to apply upstream patches to kpatch
-%patch100 -p1
+#%patch100 -p1
 
 %setup -D -T -a 1
 
@@ -60,19 +77,16 @@ kpatch-patch packages updates.
 #cd ..
 
 %build
-make -C man
+make
 
 make -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} 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
@@ -87,7 +101,19 @@ 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
+* Fri Sep 03 2021 Davide Cavalca <dcavalca@centosproject.org> - 0.9.4-1.6
+- Sync with c8s-sig-hyperscale
+- Update to 0.9.4
+- Add kpatch-build arched subpackage
+- Add kpatch-runtime noarch subpackage to provide and obsolete kpatch
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.3-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688