diff --git a/.gitignore b/.gitignore
index 60f12a9..01a3c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/vdo-827e5e0.tar.gz
+SOURCES/vdo-c658747.tar.gz
diff --git a/.vdo.metadata b/.vdo.metadata
index 4f4ad8c..a8d6a00 100644
--- a/.vdo.metadata
+++ b/.vdo.metadata
@@ -1 +1 @@
-d92406e32af15c45485a3d3b9a93723c492da7e2 SOURCES/vdo-827e5e0.tar.gz
+554e49ae907caf589ff90f14952ec6dd38bc7f86 SOURCES/vdo-c658747.tar.gz
diff --git a/SPECS/vdo.spec b/SPECS/vdo.spec
index 557da71..9d0797a 100644
--- a/SPECS/vdo.spec
+++ b/SPECS/vdo.spec
@@ -1,5 +1,5 @@
-%global commit 827e5e0974c62a4e169766020fb69b3f34015851
-%global gittag 6.2.4.14
+%global commit c658747fb8964e3a46c934e1e382de0abd5bb901
+%global gittag 6.2.5.74
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define spec_release 14
@@ -52,10 +52,11 @@ This package provides the user-space management tools for VDO.
make
%install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
- defaultdocdir=%{_defaultdocdir} name=%{name} \
- python3_sitelib=%{python3_sitelib} mandir=%{_mandir} \
- unitdir=%{_unitdir} presetdir=%{_presetdir} sysconfdir=%{_sysconfdir}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= name=%{name} \
+ bindir=%{_bindir} defaultdocdir=%{_defaultdocdir} libexecdir=%{_libexecdir} \
+ mandir=%{_mandir} presetdir=%{_presetdir} \
+ python3_sitelib=/%{python3_sitelib} sysconfdir=%{_sysconfdir} \
+ unitdir=%{_unitdir}
# Fix the python3 shebangs
for file in %{_bindir}/vdo \
@@ -83,6 +84,7 @@ done
%{_bindir}/vdoforcerebuild
%{_bindir}/vdoformat
%{_bindir}/vdosetuuid
+%{_libexecdir}/vdoprepareforlvm
%dir %{python3_sitelib}/%{name}
%{python3_sitelib}/%{name}/__init__.py
%{python3_sitelib}/%{name}/__pycache__/__init__.cpython-36.opt-1.pyc
@@ -207,6 +209,7 @@ done
%{_mandir}/man8/vdodumpconfig.8.gz
%{_mandir}/man8/vdoforcerebuild.8.gz
%{_mandir}/man8/vdoformat.8.gz
+%{_mandir}/man8/vdoprepareforlvm.8.gz
%{_mandir}/man8/vdosetuuid.8.gz
%package support
@@ -237,6 +240,49 @@ This package provides the user-space support tools for VDO.
%{_mandir}/man8/vdoregenerategeometry.8.gz
%changelog
+* Fri Aug 20 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.74-14
+- Renamed vdo2LVM to vdopreparelvm and moved its installation location to
+ /usr/libexec so that it is not in common default paths as this utility is
+ intended to be called from LVM, not directly by users.
+- Related: rhbz#1986930
+
+* Thu Jul 22 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.65-14
+- Fixed Coverity scan issues.
+- Resolves: rhbz#1982878
+
+* Thu Jul 15 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.62-14
+- Removed extraneous fields from the super block of a converted index.
+- Resolves: rhbz#1965546
+- Added a parameter to the lvm conversion tool to specify the amount of
+ space to free up.
+- Resolves: rhbz#1966827
+- Fixed calculation of the number of expiring chapters in a converted
+ index.
+- Resolves: rhbz#1975546
+
+* Tue Jun 01 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.41-14
+- Integrated the vdo to lvm conversion tool into the vdo management script
+ and modified the tool itself to correctly convert the UDS index so that
+ dedupe information is not lost by conversion.
+- Resolves: rhbz#1928284
+
+* Thu May 20 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.21-14
+- Added a tool for converting a VDO volume from the vdo management script
+ to LVM. The tool can be invoked from the new vdo convert command.
+- Related: rhbz#1928284
+- Fixed a (relatively harmless) buffer overflow in vdo userspace tools.
+- Resolves: rhbz#1927938
+
+* Thu May 13 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.11-14
+- Introduced new memory size parameter values for UDS indexes which have
+ been converted from vdo script management to LVM.
+- Related: rhbz1928284
+- Modified vdo script to fail if the same option is supplied multiple
+ times.
+- Resolves: rhbz#1944087
+- Fixed permissions on the vdo script's lock directory.
+- Resolves: rhbz#1952105
+
* Thu Oct 01 2020 - Andy Walsh <awalsh@redhat.com> - 6.2.4.14-14
- Added --pending option to the vdo status command to indicate
configuration options which have been modified but will not take