diff --git a/.gitignore b/.gitignore
index 431b0a1..c7c486a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/fetchmail-6.4.19.tar.xz
-/fetchmail-6.4.19.tar.xz.asc
+/fetchmail-6.4.20.tar.xz
+/fetchmail-6.4.20.tar.xz.asc
diff --git a/fetchmail.spec b/fetchmail.spec
index 05167b6..fc4bb05 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,7 +1,7 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.4.19
-Release: 2%{?dist}
+Version: 6.4.20
+Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
 # systemd service file
@@ -62,6 +62,9 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
 
 %changelog
+* Tue Aug 03 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.20-1
+- Update to fetchmail-6.4.20 (CVE-2021-36386)
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 966c58e..c282678 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fetchmail-6.4.19.tar.xz) = b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
-SHA512 (fetchmail-6.4.19.tar.xz.asc) = fe83c2d49349812164de45e34084dc923e472b56d1d5c449687899896fe8c646560a6bb2e1b925ad9acf51fd855484d1aae8e58c10dbab871f0b9b16d27ea4c2
+SHA512 (fetchmail-6.4.20.tar.xz) = 5b170f51a74b6596020282f5cbb34bf0a9ea8c5b089fd8c6c72df6c7742e16bcd5931d62181d56265779f9c3431c4ddf795a03deee09c5552a3aa0601282bd17
+SHA512 (fetchmail-6.4.20.tar.xz.asc) = a3cab9f2d8dabd8e80b99fcb1b77c59b9dda9731cc0f5493fcbc454057f609225dfb32d68f7cf2e41c5accc78ad30825033cee5e3933ab876707657c0403dabc