diff --git a/.gitignore b/.gitignore
index 9b97d51..6bf478b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kvdo-36c3e1c.tar.gz
+/kvdo-2e1a578.tar.gz
diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec
index ab2be6e..5819412 100644
--- a/kmod-kvdo.spec
+++ b/kmod-kvdo.spec
@@ -1,12 +1,12 @@
-%global commit                  36c3e1cb1ac054761e6ff726d374fde770ab790b
-%global gittag                  8.1.0.4
+%global commit                  2e1a578587c36eb698525b7929b76e624dba4d70
+%global gittag                  8.1.0.264
 %global shortcommit             %(c=%{commit}; echo ${c:0:7})
 %define spec_release            1
 
 %define kmod_name		kvdo
 %define kmod_driver_version	%{gittag}
 %define kmod_rpm_release	%{spec_release}
-%define kmod_kernel_version	5.12.0-1.el9
+%define kmod_kernel_version	5.14.0-0.rc3.29.el9
 %define kmod_headers_version	%(rpm -qa kernel-devel | sed 's/^kernel-devel-//')
 %define kmod_kbuild_dir		.
 %define kmod_devel_package	0
@@ -152,6 +152,12 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jul 29 2021 - Andy Walsh <awalsh@redhat.com> - 8.1.0.264-1
+- Rebased to upstream candidate.
+- Related: rhbz#1955374
+- Fixed GCC implicit-fallthrough errors when building for latest kernel
+- Resolves: rhbz#1984814
+
 * Tue May 04 2021 - Andy Walsh <awalsh@redhat.com> - 8.1.0.4-1
 - Initial build for EL9
 - Related: rhbz#1955374
diff --git a/sources b/sources
index 33ae7a3..3f12283 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kvdo-36c3e1c.tar.gz) = 11a36a1319db487402eea30825575c23c67afc5bfcd03456f7e0b2458af6da103eccac6704a9fbdba119dcdc2a87171ef5a3f6e3791f40d08a6273b49044d899
+SHA512 (kvdo-2e1a578.tar.gz) = de5f6ae9936cad972171b1dabb00ccf766cebb1be7e1f4aa87bb2fa11d310dab1dcc399f75e25a10cc1751828f5567e4865b1b9244b2c9b5a90f11550e0743fd