diff --git a/.gitignore b/.gitignore
index f8f04fb..374f878 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,3 +242,4 @@
 /anaconda-33.14.tar.bz2
 /anaconda-33.15.tar.bz2
 /anaconda-33.17.tar.bz2
+/anaconda-33.18.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index d4d849a..0c65364 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 33.17
+Version: 33.18
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -362,6 +362,17 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Wed Jun 03 2020 Martin Kolman <mkolman@redhat.com> - 33.18-1
+- Set up LD_PRELOAD for the Payloads module (vponcova)
+- Extend the start-module script (vponcova)
+- subscription: Fix authentication method switching in GUI (mkolman)
+- subscription: Make sure CDN repos are loaded and usable (mkolman)
+- Add NFS ISO support back to the NFS SetupSourceTask (jkonecny)
+- Add NFS ISO support to the NFSSourceModule (jkonecny)
+- Tear down HDD device mount if no valid installation source is found
+  (jkonecny)
+- Extract ISO find algorith from harddrive (jkonecny)
+
 * Mon Jun 01 2020 Martin Kolman <mkolman@redhat.com> - 33.17-1
 - Update required ack in makebumpver script for rhel > 7 (rvykydal)
 - Close responses from session.get (vponcova)
diff --git a/sources b/sources
index 54cce9c..bb744ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-33.17.tar.bz2) = 0a5404f845f587251be08a7ba66deea2b3f6eeaef9d3b68429e0c343587849d0c5cd5383179926a461025e5c1c2a7696ac4cb9ef15cae93ee3423b17b453c432
+SHA512 (anaconda-33.18.tar.bz2) = 7ea8173d40a279c7c47becdadc586fa40161148f294f0d0df02e786b7080695c2c5b46d2609d792b290671f1aafd7b6157288182bf79d45f48bfc935eea39ead