diff --git a/.gitignore b/.gitignore
index cdd5eac..41b2e04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,3 +266,4 @@
 /anaconda-34.15.tar.bz2
 /anaconda-34.16.tar.bz2
 /anaconda-34.17.tar.bz2
+/anaconda-34.18.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index a95f4f0..d834f4f 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 34.17
+Version: 34.18
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -369,6 +369,25 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Jan 18 2021 Martin Kolman <mkolman@redhat.com> - 34.18-1
+- Skip payload-related spokes in the initial setup (#1915541) (vponcova)
+- Always show pykickstart parse warnings (vslavik)
+- Grab GitHub notifications for periodic workflows (jkonecny)
+- Split OSTree sysroot-setting to a task (vslavik)
+- Split OSTree pull to a task (vslavik)
+- Split OSTree deployment to a task (vslavik)
+- Stop the timer that calls a callback for clicking on the continue button
+  (vponcova)
+- Formatting fixes (vslavik)
+- Split OSTree bootloader configuration to a task (vslavik)
+- Split OSTree remote changes to a task (vslavik)
+- Split OSTree fs and repo initialization to a task (vslavik)
+- Split OSTree bootloader data copying to a task (vslavik)
+- Split OStree mount target preparation to a task (vslavik)
+- Move the RPM OSTree test to a directory (vslavik)
+- Move the safe_exec_with_redirect function (vslavik)
+- Save logs correctly after container update GH action run (jkonecny)
+
 * Mon Jan 11 2021 Martin Kolman <mkolman@redhat.com> - 34.17-1
 - Always report IPMI events from the exit dialog windows (vponcova)
 - Always report IPMI events from the exception handler (vponcova)
diff --git a/sources b/sources
index 106b9f9..522be21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-34.17.tar.bz2) = fbdc48a8fee53eafb2c3d9756e3affa4659f53d9114ce98c6b5652f1d3b5c8c08cf740fa02939f9bfb245827797429f97529ea7b67574b7e267c5a953ee56375
+SHA512 (anaconda-34.18.tar.bz2) = 20b1fddea67a043734a44e07c1245f6d50a776c85c65592bec0b7c511e24b6c832ebe6e2824d3bfc71de0522005c6847d08691feaac6b7116156c8287534d73e