diff --git a/.gitignore b/.gitignore
index 7161d56..6984ce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -298,3 +298,4 @@
 /anaconda-36.1.tar.bz2
 /anaconda-36.2.tar.bz2
 /anaconda-36.3.tar.bz2
+/anaconda-36.4.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index ff80be9..3d8f2c7 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 36.3
+Version: 36.4
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -407,6 +407,24 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Thu Sep 23 2021 Martin Kolman <mkolman@redhat.com> - 36.4-1
+- Do not crash if restorecon is missing on target system (vslavik)
+- Move chmod into file copying function in CopyLogsTask (vslavik)
+- Clarify that the software selection doesn't affect the Anaconda configuration
+  (vponcova)
+- Set an upper bound to entered sizes (#1992585) (vponcova)
+- Revert "Install kbd-legacy if keyboard layout is "fi" (#1955793)" (vponcova)
+- Use octal permissions instead of hexadecimal (vslavik)
+- Handle new time zones in GUI after earlier switch to zoneinfo (vslavik)
+- Do not stretch NTP toggle in GUI (vslavik)
+- Add AlmaLinux profile (andrew.lukoshko)
+- The NTP server dialog without entries shouldn't crash (#2001591) (vponcova)
+- Set hostname also from ip= static configuration without device (#1988521)
+  (rvykydal)
+- Add Silverblue specific logos to profile. (jaberan)
+- data/profile.d: Add profiles for KDE & Kinoite Spins (tim)
+- Fix Removed options inst.[product|variant] were subsections (jkonecny)
+
 * Thu Sep 16 2021 Martin Kolman <mkolman@redhat.com> - 36.3-1
 - Fix boolean comparisons in asserts (vslavik)
 - Stop using distutils to compare kernel versions (vslavik)
diff --git a/sources b/sources
index 69fa92f..2e043d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-36.3.tar.bz2) = d12ed728f8ee1e337474ef48c50bd56a0a70f79ba69d83d395889dd03e7f2355ac35bca47bb892041b28db673aa58cbb9ffac7948ffd078c076387c12382be9f
+SHA512 (anaconda-36.4.tar.bz2) = 91332eb2bc45b916178027665287461cc8d6ef22cbd30e0b51d67455474e556c4b6213f15098af40d797e288972423d0d17ac2614f8903eaf4585c4a31485248