diff --git a/convert2rhel/__init__.py b/convert2rhel/__init__.py
index b506b0e8a..b9aa4a4c8 100644
--- a/convert2rhel/__init__.py
+++ b/convert2rhel/__init__.py
@@ -1,2 +1,2 @@
 __metaclass__ = type
-__version__ = "1.6.1"
+__version__ = "1.7.0"
diff --git a/man/convert2rhel.8 b/man/convert2rhel.8
index 309caaa69..8a755d34c 100644
--- a/man/convert2rhel.8
+++ b/man/convert2rhel.8
@@ -1,4 +1,4 @@
-.TH CONVERT2RHEL "1" "2023\-11\-02" "convert2rhel 1.6.0" "General Commands Manual"
+.TH CONVERT2RHEL "1" "2024\-02\-22" "convert2rhel 1.7.0" "General Commands Manual"
 .SH NAME
 convert2rhel \- Automates the conversion of Red Hat Enterprise Linux derivative distributions to Red Hat Enterprise Linux.
 .SH SYNOPSIS
@@ -52,6 +52,9 @@ Skip gathering changed rpm files using 'rpm \-Va'. By default it's performed
 before and after the conversion with the output stored in log files rpm_va.log
 and rpm_va_after_conversion.log. At the end of the conversion, these logs are
 compared to show you what rpm files have been affected by the conversion.
+Cannot be used with analyze subcommand. The environment variable
+CONVERT2RHEL_UNSUPPORTED_INCOMPLETE_ROLLBACK needs to be set to 1 to use this
+argument.
 
 .TP
 \fB\-\-eus\fR
@@ -195,6 +198,9 @@ Skip gathering changed rpm files using 'rpm \-Va'. By default it's performed
 before and after the conversion with the output stored in log files rpm_va.log
 and rpm_va_after_conversion.log. At the end of the conversion, these logs are
 compared to show you what rpm files have been affected by the conversion.
+Cannot be used with analyze subcommand. The environment variable
+CONVERT2RHEL_UNSUPPORTED_INCOMPLETE_ROLLBACK needs to be set to 1 to use this
+argument.
 
 .TP
 \fB\-\-eus\fR
diff --git a/man/synopsis b/man/synopsis
new file mode 100644
index 000000000..4bcf812a2
--- /dev/null
+++ b/man/synopsis
@@ -0,0 +1,6 @@
+[synopsis]
+.
+  convert2rhel [--version] [-h]
+  convert2rhel <subcommand> [-u username] [-p password | -c conf_file_path] [--pool pool_id | -a] [--disablerepo repoid] [--enablerepo repoid] [--serverurl url] [--no-rpm-va] [--eus] [--debug] [--restart] [-y]
+  convert2rhel <subcommand> [--no-rhsm] [--disablerepo repoid] [--enablerepo repoid] [--no-rpm-va] [--eus] [--debug] [--restart] [-y]
+  convert2rhel <subcommand> [-k activation_key | -c conf_file_path] [-o organization] [--pool pool_id | -a] [--disablerepo repoid] [--enablerepo repoid] [--serverurl url] [--no-rpm-va] [--eus] [--debug] [--restart] [-y]
diff --git a/packaging/convert2rhel.spec b/packaging/convert2rhel.spec
index 778f3ab8b..98e980266 100644
--- a/packaging/convert2rhel.spec
+++ b/packaging/convert2rhel.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           convert2rhel
-Version:        1.6.1
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Automates the conversion of RHEL derivative distributions to RHEL
 
@@ -122,6 +122,36 @@ install -m 0600 config/convert2rhel.ini %{buildroot}%{_sysconfdir}/convert2rhel.
 %attr(0644,root,root) %{_mandir}/man8/%{name}.8*
 
 %changelog
+
+* Thu Feb 22 2024 Freya Gustavsson <fgustavs@redhat.com> 1.7.0
+- Compare the release part of the c2r rpm NEVRA
+- Update remediation key to match leapp report metadata
+- Rewrite the log messages using the word "unsupported" in is_loaded_kernel_latest()
+- Update latest kernel check with OVERRIDABLE results
+- Change `ignore` to `disregard` in messages
+- Add remediation to overridable result in package updates action
+- Add OVERRIDABLE result to tainted kernel module check
+- Replace the word `skip` in report messages
+- Change OVERRIDABLE result to WARNING message in package update action
+- Port RestorableFile to BackupController
+- Port certs and restorable key to backup module
+- Port RestorablePackageSet to packages module
+- Add preconversion analysis check for device PART_ENTRY_NUMBER
+- Add diagnosis for failures in validating yum transaction
+- Duplicate package check for preconversion analysis
+- Always save conversion facts file
+- Host metering
+- Specify a full path to the called modinfo utility
+- Fix Alma Linux 8 packages being seen as third-party
+- Collect environment variables in breadcrumbs
+- Refactor logger to not require root
+- Reduce timeout for the internet connectivity check
+- Fix file clash in NewRestorableFile
+- Move logger initialization to initialize module
+- Swap base os specific packages
+- Port the repo backup to RestorableFile
+- Add shim-x64 to the exclude list for Alma 8
+
 * Wed Dec 13 2023 Preston Watson <prwatson@redhat.com> 1.6.1
 - Fix parsing yumdownloader output with a carriage return