diff --git a/.fetchmail.metadata b/.fetchmail.metadata
index e76e9cf..46d5877 100644
--- a/.fetchmail.metadata
+++ b/.fetchmail.metadata
@@ -1 +1 @@
-1fd3e4f30bd9ba7bdcaed5edfca080dc6f66377e SOURCES/fetchmail-6.4.18.tar.xz
+e26d63637e1e016f93a1e75fa0131be63b274a79 SOURCES/fetchmail-6.4.24.tar.xz
diff --git a/.gitignore b/.gitignore
index 787a4b9..1117069 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/fetchmail-6.4.18.tar.xz
+SOURCES/fetchmail-6.4.24.tar.xz
diff --git a/SOURCES/fetchmail-6.4.18.tar.xz.asc b/SOURCES/fetchmail-6.4.18.tar.xz.asc
deleted file mode 100644
index c51dfae..0000000
--- a/SOURCES/fetchmail-6.4.18.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmBfs8oACgkQ5BKxVu/z
-hVpOVg//QSBEHWICzODqTjoXRbM0SodkWMPMCnQuYG4FlYebgOjd5XNWtBxO6G46
-YmQculL3jWaPc5QUBQGEF1p3MhLS/GUv82EgRLXb0fDkjdzJY29ZvRtrOyPbN4/z
-exPjrxZn+U1aLZlJI0FGSz3vkDlNNs1EHe01BQU3+XtPRoNzKpOSAMDyLqFexD7U
-/z854cVhZ/jf4e4fYVoRCCpG8bIqwyhqAOwW+45ZUcqV0VO8TRs0vsAIpMnw2aAm
-GDrOgw/39qtQnL6ctSj9/3clumpI2qyCeaOXZcnmpdncx7viWcjL7y9uruiEMgLn
-Xm71mec2NA60k8d6CESL52hI7Qm5t2j2XPVH3lqgppJGz/uIWIMZsU0c1AzH1DYe
-eeEZRRNnjMBAx+hR/ItWYvIrrmt8FBhQmq6i+0c/MdZ7QhdX7nc1VLdUFYXqmJOM
-4vbh1IONfvPPkH1T3zTQNDePEqw8f+rG/xuTMLEAJ7WJjgG7kqoxmyRB0CPaQvqd
-ZpL7ZcxpTnr16/mj2JSKrpyxzkKzpYxL+OYQd7e8N8eKOEafoQsFtz2TetbJoRGI
-i4O6Zbs5ig6X4xmNdFkkLPKGXtmC5Gz5PKYz/zfE9H0uUEpvJiXKt5GOuOkYxJxm
-aGLJNgGrMp77S6knmjqJFKjnSu7dkLZKXP22HjJ0epkaf8l8TQ4=
-=EJH4
------END PGP SIGNATURE-----
diff --git a/SOURCES/fetchmail-6.4.24.tar.xz.asc b/SOURCES/fetchmail-6.4.24.tar.xz.asc
new file mode 100644
index 0000000..8723ce4
--- /dev/null
+++ b/SOURCES/fetchmail-6.4.24.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmGYwTUACgkQ5BKxVu/z
+hVqeGA//VRV5nPsdlKbla2N78fFCGX6A7UF2UDFJsivAP3KzQRZWc2YFQ+GQJ3l7
+WPhnyeUrfomrv6QAstMEJ4D+Kymga018qOTNmHmaU5I2lToEJV87EAoo5QjlzbwX
+wIP7wNapOCAxcOWc4Mux8nR1mH89/TlS+lV2KoHYDVB0zn1KdGvqJYSQUHeDSis+
+vVA9Wj6LiKPO4cZ6l5ki3x9qiOyNJ5jqiZPxdJz8mZfY+h18oxMpd7GssXi1utC9
+CLt9kbryW0yCPvnetgKOL5OyEbTW6fbWJhggj7eb4YI5M1YBGMe5xfdlUgVznG5b
+mfjc5Rb6x709CCtOSxcYgXjDDdyHhTWEP/TiO/FQOWjUgydtTI3yiNBTFbkxsJZw
+rOLDLMHkbbrbKULY8uMREFTX0OSLwfM5BC3yG4/OiLizHlkntPcwdWx+5Stp+45E
+L3WTPyMzn06yyd84hewgQx8xlYcOBSwZerdILVuAeeRZBCplrAbzBW9rn9/na+Ak
+VtzkgSFyPAH63+G+iOEaG3nLeNqxDnlZHtD6youL7HfhON3W2siAodDk+X/omGaB
+HDiCs/7HcQGDp8JspDSNqTM7bHPJn9gHGhQxR13ywRSulov1dMwoduL8iIAse1Yp
+uqtg1vg4WAI+3ujPs7vGgu+OtD4qy2smo4e6kLNJy0yVVXp2aD8=
+=604d
+-----END PGP SIGNATURE-----
diff --git a/SPECS/fetchmail.spec b/SPECS/fetchmail.spec
index 4d5289c..af5d64d 100644
--- a/SPECS/fetchmail.spec
+++ b/SPECS/fetchmail.spec
@@ -1,7 +1,7 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.4.18
-Release: 4%{?dist}
+Version: 6.4.24
+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,10 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
 
 %changelog
+* Mon Jan 10 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.24-1
+- Update to fetchmail-6.4.24 (fixes CVE-2021-36386 and CVE-2021-39272)
+  Resolves: #2005307, #1999276
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.4.18-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688