diff --git a/.gitignore b/.gitignore
index b174767..2d9e27b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -298,3 +298,4 @@
 /anaconda-34.25.0.15.tar.bz2
 /anaconda-34.25.0.16.tar.bz2
 /anaconda-34.25.0.17.tar.bz2
+/anaconda-34.25.0.18.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index b1e1795..c9f36df 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 34.25.0.17
+Version: 34.25.0.18
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -407,6 +407,14 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Wed Oct 06 2021 Radek Vykydal <rvykydal@redhat.com> - 34.25.0.18-1
+- Fix Satellite provisioning rollback after unregistration (mkolman)
+  Resolves: rhbz#2006718
+- Payload should wait for all storage related threads to finish (mkolman)
+  Resolves: rhbz#2006786
+- Make organization fetching errors non-fatal (mkolman)
+  Resolves: rhbz#2006375
+
 * Thu Sep 23 2021 Radek Vykydal <rvykydal@redhat.com> - 34.25.0.17-1
 - Verify the OPAL compatibility with XFS features (vponcova)
   Resolves: rhbz#2000923
diff --git a/sources b/sources
index 942c437..329439b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-34.25.0.17.tar.bz2) = 55a666694193eb05ad02cc4c0229e9043d931affc37538be395757112235deb7c546e04649f629ceec01f5d8cea27c6eb62de0aa11b1a1e2af6c2c6c57832005
+SHA512 (anaconda-34.25.0.18.tar.bz2) = 105dc78d23755a6f5b25934357c57d2000451361eb6f92c53534a739d4f7c187b7f7ab5f6e68fd64bf81ac38fdbaa743c056c74958f372c4ee5ed82347ce446d