diff --git a/fetchmail-6.4.20.tar.xz b/fetchmail-6.4.20.tar.xz
deleted file mode 100644
index d292d369072bec23a02890e1c0b950b3a5933ac6..0000000000000000000000000000000000000000
Binary files a/fetchmail-6.4.20.tar.xz and /dev/null differ
diff --git a/fetchmail-6.4.20.tar.xz.asc b/fetchmail-6.4.20.tar.xz.asc
deleted file mode 100644
index e3a54ac15440e555d80e7807dd4c486b865aae26..0000000000000000000000000000000000000000
--- a/fetchmail-6.4.20.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmEBhtMACgkQ5BKxVu/z
-hVoVQBAAlSjS4HaUnnHFiNNtCP0QITl/7+a1tCS3E8HdAOyn+kU2idHJnFmQ/2jL
-Z2qkpXaKa8kvJHr/I603xJFxf9IMpLu2qD0IjMFOgzTjGWc7b/Vk1n1n88Oeo34V
-sGfMqxnqzeqW8ejdptbHFq4oJcfV1rZhT6w2mXwNJiH0e8w6EX4xqR/xU1Jyqvxo
-dmJpKt1uPGvkenSZvetyO4flwQKCwFGS6mx6taPpbHC4LsfugE+AP1AKPnEFg+Ai
-p1+5ieSkuSxIJc09EYw5ahfch2txV6cxX1qKkaWrmYkjfzKl2XyUOoUT+KjZBihR
-CwA5W4ybNxbIOOo9r1+UB8kQslhjDbpJuCnNEt3HpOzcGCHtEHbYqJhyvUq/DO19
-fYKSmg2DcC709oM3drQOXBk2NV5YJ6QWoBvEp3f169ZvsO+clwkPumUXADUdM8EK
-vwzwdn+a0LyoET+xmB5CSfxHwr8sizO2sihm6nZBR+hGQgoTkyRg7OckxAQu9Q/9
-dZ2S1srB2cWurrl/BIJYFTIWXV8Y66HI5USv1y5fAUFR4uFJVh/oQuhp3Jnykf9m
-Fgsb37MHK2EycwmYmIXMRyGpJ7w2EjBdoePYwi/YFJzHVuSSzC3k3Iz738xDgxA6
-ikE11M+GN+qXzyCfMQfE4l6MMvBZoB41mPm01j28nWMSZ7a9Glg=
-=brTa
------END PGP SIGNATURE-----
diff --git a/fetchmail-6.4.22.rc3.tar.xz b/fetchmail-6.4.22.rc3.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..a76a266478034f284ca9994cea2b3cdfd058fef8
Binary files /dev/null and b/fetchmail-6.4.22.rc3.tar.xz differ
diff --git a/fetchmail-6.4.22.rc3.tar.xz.asc b/fetchmail-6.4.22.rc3.tar.xz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..d59ca2c7a028cc34ab625cd8bedf40a447daf3d5
--- /dev/null
+++ b/fetchmail-6.4.22.rc3.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmErqHwACgkQ5BKxVu/z
+hVrDAg//YUw/ZPdBTZ3J2JtPzdxpPLN+9Kdej0xNb3VrOnYqxGBcrYT4QyMWjVOi
+y0fwmvCFiNbkaeXHYG7G6rwsw7j0QcKE7V/d/O+rOoq/nNYPhoTURJ5QGMxVBfU6
+FResKSQ0NtJl/e1/HnjOTfyFgSOlmBocuL8nF/YHc+Wf9Lq2mtSXghOo6ggcethU
+WFJ1727AdP/EWbeRBHlEp6ie0sKM6QzYsXz/do0jXTh5tVda3r5V08alcGdsWRuK
+FYGYp9kUjtpwDJC+3NhHBjxaieZh1pj3dlXfBR0gLe4d+Pl3rPmm7NVWTe9CS/ub
+r1YTpOxpsW2h8R/stw8xSGfmYmM11zA2cXRj96thvrkvXSNibB/5NqexrE8dGPkK
+fUyIVLdg65bNrhreEBATenbyTzr2lwPJ4wfs9IYVYLgzx2qhaP7MauFswn7mag14
+byPseWMOAVnQ7j1vTahJZprcxPllkIJZwTw2mrD4UkEriuXPgiunzTM6j6SF5ct6
+yHaZZpNAPH/ZEIaNqj6r/dGeLVQ1725KpHwe2YPOFOz3BYe/LxMP9z0ksS4YBkHr
++gUXdwh73puM+6GDgfsi/UPv9GT52tEfo7D1PmjWprwQocg4zQrUdtqt90pJCKF9
+iJcfF05H946sx81I2aC1tmQ/sb05D7z+KZKiUEqRYUERGK1sbFo=
+=E0Yh
+-----END PGP SIGNATURE-----
diff --git a/fetchmail.spec b/fetchmail.spec
index d44e23ae5f1781a7c26ff110ce30c02eb33b1005..b834bb83e910a782f2a3f4697d091eb87b3a6a21 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,11 +1,11 @@
 Summary:             A remote mail retrieval and forwarding utility
 Name:                fetchmail
-Version:             6.4.20
+Version:             6.4.22
 Release:             1
 URL:                 http://www.fetchmail.info/
 License:             GPL+ and Public Domain
-Source0:             http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-Source1:             http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
+Source0:             https://sourceforge.net/projects/%{name}/files/branch_6.4/%{name}-%{version}.rc3.tar.xz
+Source1:             https://sourceforge.net/projects/%{name}/files/branch_6.4/%{name}-%{version}.rc3.tar.xz.asc
 Source2:             fetchmail.service
 Source3:             fetchmailrc.example
 BuildRequires:       gcc gettext-devel krb5-devel openssl-devel systemd python3-devel
@@ -20,7 +20,7 @@ Install fetchmail if you need to retrieve mail over SLIP or PPP
 connections.
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{version}.rc3 -p1
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --without-hesiod \
@@ -49,7 +49,10 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
 
 %changelog
-* Tue Aug 10 2021 houyingchao <houyingchao@huawei.com> - 6.4.21-1
+* Fri Sep 10 2021 yaoxin <yaoxin30@huawei.com> - 6.4.22-1
+- Update 6.4.22 to fix CVE-2021-39272
+
+* Tue Aug 10 2021 houyingchao <houyingchao@huawei.com> - 6.4.20-1
 - Update from 6.4.1 to 6.4.20
 
 * Wed Oct 28 2020 jialei <jialei17@huawei.com> - 6.4.1-1