diff --git a/.gitignore b/.gitignore
index 867e140..79560fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/vdo-0bbe708.tar.gz
+SOURCES/vdo-163f9d8.tar.gz
diff --git a/.vdo.metadata b/.vdo.metadata
index bbe96b1..7f9fa4a 100644
--- a/.vdo.metadata
+++ b/.vdo.metadata
@@ -1 +1 @@
-1aeb0549bca11ba41aa3dc16701f72f24c627b2f SOURCES/vdo-0bbe708.tar.gz
+6dd5408887dff0dbc5aa1b0d689ecbc540ee6889 SOURCES/vdo-163f9d8.tar.gz
diff --git a/SPECS/vdo.spec b/SPECS/vdo.spec
index b7558ce..1fef1a7 100644
--- a/SPECS/vdo.spec
+++ b/SPECS/vdo.spec
@@ -1,5 +1,5 @@
-%global commit           0bbe70862b691da346536a1dd3e75be47a3514eb
-%global gittag           8.1.1.360
+%global commit           163f9d85ace03428e092b25e251e0388deb5b868
+%global gittag           8.2.0.2
 %global shortcommit      %(c=%{commit}; echo ${c:0:7})
 
 %define spec_release 1
@@ -12,7 +12,7 @@ Source0: https://github.com/dm-vdo/%{name}/archive/%{commit}/%{name}-%{shortcomm
 Patch0:  fix_dmeventd_linking.patch
 URL: http://github.com/dm-vdo/vdo
 # Requires: libuuid >= 2.23
-Requires: kmod-kvdo >= 6.2
+Requires: kmod-kvdo >= 8.2
 # Requires: util-linux >= 2.32.1-7
 Provides: kvdo-kmod-common = %{version}
 ExcludeArch: s390
@@ -63,11 +63,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
 %dir %{_defaultdocdir}/%{name}
 %license %{_defaultdocdir}/%{name}/COPYING
 %dir %{_defaultdocdir}/%{name}/examples
-%dir %{_defaultdocdir}/%{name}/examples/ansible
-%doc %{_defaultdocdir}/%{name}/examples/ansible/README.txt
-%doc %{_defaultdocdir}/%{name}/examples/ansible/test_vdocreate.yml
-%doc %{_defaultdocdir}/%{name}/examples/ansible/test_vdocreate_alloptions.yml
-%doc %{_defaultdocdir}/%{name}/examples/ansible/test_vdoremove.yml
 %dir %{_defaultdocdir}/%{name}/examples/monitor
 %doc %{_defaultdocdir}/%{name}/examples/monitor/monitor_check_vdostats_logicalSpace.pl
 %doc %{_defaultdocdir}/%{name}/examples/monitor/monitor_check_vdostats_physicalSpace.pl
@@ -98,6 +93,7 @@ This package provides the user-space support tools for VDO.
 %{_bindir}/vdodumpmetadata
 %{_bindir}/vdolistmetadata
 %{_bindir}/vdoreadonly
+%{_bindir}/vdorecover
 %{_bindir}/vdoregenerategeometry
 %{_mandir}/man8/adaptlvm.8.gz
 %{_mandir}/man8/vdoaudit.8.gz
@@ -106,9 +102,14 @@ This package provides the user-space support tools for VDO.
 %{_mandir}/man8/vdodumpmetadata.8.gz
 %{_mandir}/man8/vdolistmetadata.8.gz
 %{_mandir}/man8/vdoreadonly.8.gz
+%{_mandir}/man8/vdorecover.8.gz
 %{_mandir}/man8/vdoregenerategeometry.8.gz
 
 %changelog
+* Tue Jul 19 2022 - Andy Walsh <awalsh@redhat.com> - 8.2.0.2-1
+- Rebased to latest upstream candidate.
+- Resolves: rhbz#2071648
+
 * Sat Feb 12 2022 - Andy Walsh <awalsh@redhat.com> - 8.1.1.360-1
 - Fixed vdostats output issues.
 - Resolves: rhbz#2004576