diff --git a/.gitignore b/.gitignore
index 32e99d9..92c7c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -197,3 +197,4 @@
 /anaconda-31.15.tar.bz2
 /anaconda-31.16.tar.bz2
 /anaconda-31.17.tar.bz2
+/anaconda-31.18.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index eb932f0..733c826 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -4,7 +4,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 31.17
+Version: 31.18
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -353,6 +353,28 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Tue Jun 25 2019 Jiri Konecny <jkonecny@redhat.com> - 31.18-1
+- Add comprehensive unit tests for ConfigureFirewallTask (mkolman)
+- Fix a typo (mkolman)
+- Use FirewallMode enum firewall configuration DBus Task (#1722979) (mkolman)
+- Don't encrypt devices in the interactive partitioning by default (vponcova)
+- Provide a default passphrase for the PassphraseDialog (vponcova)
+- Set the passphrase for the automatic partitioning from the dialog (vponcova)
+- Don't use the global encryption passphrase (vponcova)
+- Add support for passphrases in the device tree module (vponcova)
+- Handle the passphrase requirements in the partitioning modules (vponcova)
+- Use _get_passphrase in the custom partitioning task (vponcova)
+- Don't generate passphrases in a kickstart file (vponcova)
+- Fix the unit tests for the Services module (vponcova)
+- Convert names of attributes and variables in custom storage helpers
+  (vponcova)
+- Fix code alignment in the custom storage helpers (vponcova)
+- Convert names of attributes and variables in the custom spoke (vponcova)
+- Remove local variables with unused values in the custom spoke (vponcova)
+- Fix code alignment in the custom spoke (vponcova)
+- Initialize attributes in the __init__ method of the custom spoke (vponcova)
+- Reorganize imports in the custom spoke (vponcova)
+
 * Mon Jun 24 2019 Martin Kolman <mkolman@redhat.com> - 31.17-1
 - Move graphical login detection to a DBus Task (#1722950) (mkolman)
 - Add DBus support for device trees of partitioning modules (vponcova)
diff --git a/sources b/sources
index 6ab700b..0d217d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-31.17.tar.bz2) = d79b793bf682c36428eed635b5b4686605eb4452a74503a333d1172607cb8760a3d3cd6ad6e1b3846644d2da6c686d2f8278b2030f6e95d0ee42340cdd757920
+SHA512 (anaconda-31.18.tar.bz2) = 76f46ac123e75f665ee3876e3a866ccf433f417500c0b317aaccbfc2472eec78113168329665f0a058558df29a29f23fd99133aaab72bcb4713d7e4ff25def8f