diff --git a/.gitignore b/.gitignore
index 7e990a1..cf5b3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/leapp-0.16.0.tar.gz
+SOURCES/leapp-0.18.0.tar.gz
diff --git a/.leapp.metadata b/.leapp.metadata
index 6fd30fe..b0717aa 100644
--- a/.leapp.metadata
+++ b/.leapp.metadata
@@ -1 +1 @@
-55a4e79ef32020e0fe16e34afe6b128cdc1b3613 SOURCES/leapp-0.16.0.tar.gz
+6f78400cf9fac51624d105c5be94945bd68e79cf SOURCES/leapp-0.18.0.tar.gz
diff --git a/SPECS/leapp.spec b/SPECS/leapp.spec
index 449119b..9c58669 100644
--- a/SPECS/leapp.spec
+++ b/SPECS/leapp.spec
@@ -36,8 +36,8 @@
 %endif
 
 Name:       leapp
-Version:    0.16.0
-Release:    2%{?dist}
+Version:    0.18.0
+Release:    1%{?dist}
 Summary:    OS & Application modernization framework
 
 License:    ASL 2.0
@@ -158,7 +158,6 @@ Requires: findutils
 
 
 # APPLY REGISTERED PATCHES HERE
-# %%patch0001 -p1
 
 
 ##################################################
@@ -242,6 +241,30 @@ install -m 0644 -p man/leapp.1 %{buildroot}%{_mandir}/man1/
 # no files here
 
 %changelog
+* Fri Aug 16 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.18.0-1
+- Rebase to new upstream version 0.18.0.
+- Properly close file descriptors for executed shell commands.
+- Resolves: RHEL-27848
+
+* Wed Jul 24 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.17.0-3
+- Fix broken leapp db queries on rerun
+- Port all code to be Python-3.12 compatible.
+- Resolves: RHEL-40363
+
+* Mon May 13 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.17.0-2
+- Minor improvement of the summary overview in the console output.
+- Store metadata about the LEAPP plugins inside leapp audit db.
+- Prevent leapp from starting if an instance is already runnning.
+- Resolves: RHEL-27848, RHEL-25407
+
+* Tue Feb 13 2024 Toshio Kuratomi <toshio@fedoraproject.org> - - 0.17.0-1
+- Rebase to upstream version v0.17.0.
+- Resolves: RHEL-21451
+
+* Fri Jan 12 2024 Petr Stodulka <pstodulk@redhat.com> - 0.16.0-3
+- Add external links to the text version of the generated report file
+- Resolves: RHEL-21451
+
 * Wed Aug 23 2023 Petr Stodulka <pstodulk@redhat.com> - 0.16.0-2
 - Bump leapp-framework to 5.0
 - Resolves: #2223312