diff --git a/.anaconda.metadata b/.anaconda.metadata
index d4e04be..84a5dbb 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-9451f3f9a21f83dadd98677ba8e2356b3e2ce242 SOURCES/anaconda-33.16.6.3.tar.bz2
+89daebc5fffb03937fa56b976370db2ecaa1b37c SOURCES/anaconda-33.16.6.4.tar.bz2
diff --git a/.gitignore b/.gitignore
index 97ea942..0915e25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-33.16.6.3.tar.bz2
+SOURCES/anaconda-33.16.6.4.tar.bz2
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index d14718a..00026aa 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 33.16.6.3
+Version: 33.16.6.4
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -367,6 +367,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Fri Nov 26 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.6.4-1
+- Wait for all background threads to finish before filling installation task
+  queue (mkolman)
+  Resolves: rhbz#1824422
+
 * Fri Nov 05 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.6.3-1
 - Fix application of network --mtu kickstart option in Anaconda (rvykydal)
   Resolves: rhbz#2018301