diff --git a/.gitignore b/.gitignore
index 49494a5..128f4c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,3 +290,4 @@
 /anaconda-35.15.tar.bz2
 /anaconda-35.16.tar.bz2
 /anaconda-35.17.tar.bz2
+/anaconda-35.18.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index 67a0835..4ca5cb4 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 35.17
+Version: 35.18
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -404,6 +404,44 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Jun 28 2021 Martin Kolman <mkolman@redhat.com> - 35.18-1
+- Use yescrypt hashing method for shadow passwords (besser82)
+- Intercept OSError thrown by crypt.crypt() on error. (besser82)
+- Add tests for system time setting (awilliam)
+- Fix time setting for daylight savings, let Python do the work (awilliam)
+- Update the pixel depth of xvnc server from 16 to 24 (rvykydal)
+- Change the Python version to 3.10 in the makeupdates script (vponcova)
+- Enable running container tests in parallel (jkonecny)
+- Fix broken hashbang (vslavik)
+- Fix typo in release docs (vslavik)
+- Clean up the initialization of PartTypeSpoke (vponcova)
+- Run installation tasks from ConfigureBootloaderWithTasks (vponcova)
+- Add the CollectConfigureBootloaderTasks method (vponcova)
+- Add the ConfigureBootloaderWithTasks method (vponcova)
+- Add suggestions to kickstart error message in liveinst (vslavik)
+- Fix potential use of uninitialized variable (vslavik)
+- Fix potential use of uninitialized variable (vslavik)
+- Fix literal curly braces in dracut scripts (vslavik)
+- Fix logging messages (vslavik)
+- Remove RPM_TESTS_ARGS support (jkonecny)
+- Disable failing test (jkonecny)
+- Disable pylint error in tests (jkonecny)
+- Disable glade tests (jkonecny)
+- Migrate rpm_tests to python3 unittest framework (jkonecny)
+- Rename rpm_tests to make them discoverable by unittest framework (jkonecny)
+- Fix tests README file (jkonecny)
+- Change NOSE_TESTS_ARGS to a similar logic for unittest framework (jkonecny)
+- Fix services after nosetests renaming to unit_tests (jkonecny)
+- Rename nosetests execution scripts and vars to unit_tests (jkonecny)
+- Rename nosetests folder to unit-tests (jkonecny)
+- Make it possible to skip install time Insights errors (#1931069) (mkolman)
+- Run our unit tests with unittest python3 framework (jkonecny)
+- Rename all unit tests methods to use test_* prefix (jkonecny)
+- Rename all tests files to make them discoverable by unittest (jkonecny)
+- Remove the upd-updates script (vslavik)
+- Remove the merge-pr script (vslavik)
+- Apply the bootloader options before the installation (vponcova)
+
 * Tue Jun 15 2021 Martin Kolman <mkolman@redhat.com> - 35.17-1
 - Fix import of Iterable from collections (rvykydal)
 - Move the support for the treeinfo metadata into a DBus module (vponcova)
diff --git a/sources b/sources
index ac4a8e5..2974a37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-35.17.tar.bz2) = 9a78949352d1a7142daf3b11006fb71aac00a8785316bc674cd9638e5c0ed2a35060b29a60c020d9eb0cdbbbb567657cac88b0f97d34857d39b05d9bc2e1ff8f
+SHA512 (anaconda-35.18.tar.bz2) = a68ddddf07b066243fde895b8b948f7ce144e89168be27d2aea9bff882abcc9b3cab226c69babf41de5155f3398e07b2a673829bffc940cbf6141cbc8453e42f