diff --git a/fetchmail-6.4.20.tar.xz b/fetchmail-6.4.20.tar.xz
deleted file mode 100644
index 090dfc1..0000000
--- a/fetchmail-6.4.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c82141ae2e8f0039ceb0c5c2eda43c5e93ad0bf7f9c6bb628092b3be74386176
-size 1317204
diff --git a/fetchmail-6.4.20.tar.xz.asc b/fetchmail-6.4.20.tar.xz.asc
deleted file mode 100644
index d95f188..0000000
--- 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.21.tar.xz b/fetchmail-6.4.21.tar.xz
new file mode 100644
index 0000000..3c2de55
--- /dev/null
+++ b/fetchmail-6.4.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+size 1318996
diff --git a/fetchmail-6.4.21.tar.xz.asc b/fetchmail-6.4.21.tar.xz.asc
new file mode 100644
index 0000000..419b32d
--- /dev/null
+++ b/fetchmail-6.4.21.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmERU34ACgkQ5BKxVu/z
+hVr5axAAhaFZJ+WyIy6uEdi5a7vTm73DYSKJFd8knNI/1Luipb0XDCq92JOiWu9v
+qdKOAvxRFbc2bWFXnaN4cHoHa/gnTU3O3xkVqexGZ0K8dysEwgMrKIqnEx36g2/5
+bvTyJOBoxYT5zamepzBDKoOpbtNJb7yOfzayMaKKoVdgnTw+jWGXxwnQyx1pcewM
+hGjY9SjgI4LSS8e28o/aeklGi0K8izZPWeSdq6NtWoN2SGF0wNevCCJTAU0fgzfG
+L2KsCmGKizzFNrYNEF/OrTtjVkPU4fNRliXbisd87Vakz1ELRcPuWv/DgH2PBqdF
+klIz5kHLKU04CmRS7ZLqKzatm5wZ5rNea8itLsx1azYik2rw9JRNZEgseA5xYwJb
+1KglR6zhVaw3HnUtd42xFwHM4gArQuNOKsR3Ar51pDbtHJEmfM02GgKuUMoPL8iy
+XEVyRKrm/ogCvqOLTJSIkuOBWiQ6S0TTgx0GeJWsWv4um0dBIHspjGqIyKb/skll
+N96hcXsHLEOSHXF8+Be0psLJg7vMjpP5+LAzdArWwjO+lHaMz1MPiEmHvGgOR6EM
+1WAoFwi7A2+uUeNKonlZ7R2w16hx2DPl08BjJ95a/cVMX3SF/Qe17ixaZIxglmSF
+ejhIZzdwjRoFvidQYuDcEedHdlIaqok8JJK5VGEKHQBXa+83tjg=
+=SQ77
+-----END PGP SIGNATURE-----
diff --git a/fetchmail.changes b/fetchmail.changes
index 8a1df17..41739a2 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug 24 16:50:40 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
+
+- Update to 6.4.21:
+  * REGRESSION FIX: The new security fix in 6.4.20 for
+    CVE-2021-36386 caused truncation of messages logged to
+    buffered outputs, predominantly --logfile.
+
 -------------------------------------------------------------------
 Thu Jul 29 07:57:07 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/fetchmail.spec b/fetchmail.spec
index d541ff3..8f0b92e 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -21,7 +21,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           fetchmail
-Version:        6.4.20
+Version:        6.4.21
 Release:        0
 Summary:        Full-Featured POP and IMAP Mail Retrieval Daemon
 License:        GPL-2.0-or-later