diff --git a/.gitignore b/.gitignore
index 022f9aa..6eb314c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /kvdo-819203a.tar.gz
 /kvdo-e209cfe.tar.gz
 /kvdo-127a993.tar.gz
+/kvdo-6077a12.tar.gz
diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec
index e903a24..566434b 100644
--- a/kmod-kvdo.spec
+++ b/kmod-kvdo.spec
@@ -1,12 +1,12 @@
-%global commit                  127a993f34010e4d8b05e46c4af2a9295c4477d0
-%global gittag                  8.2.0.2
+%global commit                  6077a128b887100e478048f67e6b8734cddd0ec7
+%global gittag                  8.2.0.18
 %global shortcommit             %(c=%{commit}; echo ${c:0:7})
 %define spec_release            45
 
 %define kmod_name		kvdo
 %define kmod_driver_version	%{gittag}
 %define kmod_rpm_release	%{spec_release}
-%define kmod_kernel_version	5.14.0-149.el9
+%define kmod_kernel_version	5.14.0-152.el9
 %define kmod_headers_version	%(rpm -qa kernel-devel | sed 's/^kernel-devel-//')
 %define kmod_kbuild_dir		.
 %define kmod_devel_package	0
@@ -153,6 +153,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 23 2022 - Andy Walsh <awalsh@redhat.com> - 8.2.0.18-45
+- Fixed a race handling timeouts of dedupe requests.
+- Resolves: rhbz#2115504
+
 * Tue Aug 23 2022 - Susan LeGendre-McGhee <slegendr@redhat.com> - 8.2.0.2-45
 - Rebuilt for latest kernel.
 - Related: rhbz#2060486
diff --git a/sources b/sources
index 376ea2e..5b33413 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kvdo-127a993.tar.gz) = f774ca12b662f9f2d11ba0024eac4f8c06222dff73b79ed5d80173186de26b725fcd19ff680773f80bcdf21bfc92d44fa12ac6cb78360d3a370b8a48e2798569
+SHA512 (kvdo-6077a12.tar.gz) = 9414be437dda1045fc1abfdc2222fca51554d188be53d68edc280d2d48ebf9d7d6a9e1f25827b3cc647f9399c8d9d8688bfe2d610e76152d861346998e43c8f2