diff --git a/fetchmail-6.3.20.tar.bz2 b/fetchmail-6.3.20.tar.bz2
deleted file mode 100644
index 620bda7..0000000
--- a/fetchmail-6.3.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22e94f11d885cb9330a197fd80217d44f65e6b087e4d4b4d83e573adfc24aa7b
-size 1723623
diff --git a/fetchmail-6.3.21.tar.bz2 b/fetchmail-6.3.21.tar.bz2
new file mode 100644
index 0000000..04a5b97
--- /dev/null
+++ b/fetchmail-6.3.21.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b20eededa7d15ab2bde2d4a0c2d169d4882021cd63042ecbed2f13999185502
+size 1724445
diff --git a/fetchmail.changes b/fetchmail.changes
index 7431ffc..c5b426b 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Aug 22 09:12:13 UTC 2011 - puzel@novell.com
+
+- update to fetchmail-6.3.21 
+ - critical bug fix
+  - The IMAP client no longer inserts NUL bytes into the last line
+    of a message when it is not closed with a LF or CRLF sequence.
+    Reported by Antoine Levitt.  As a side effect of the fix, and
+    in order to avoid a full rewrite, fetchmail will now
+    CRLF-terminate the last line fetched through IMAP, even if it
+    is originally not terminated by LF or CRLF. This bears no
+    relevance if your messages end up in mbox, but adds line
+    termination for storages (like Maildir) that do not require
+    that the last line be LF- or CRLF-terminated.
+
 -------------------------------------------------------------------
 Thu Jun 30 09:32:27 UTC 2011 - cdenicolo@novell.com
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 2dab2f1..21917f3 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -30,7 +30,7 @@ BuildRequires:  python-devel
 %if 0%{?with_krb5}
 BuildRequires:  krb5-devel
 %endif
-Version:        6.3.20
+Version:        6.3.21
 Release:        1
 License:        GPLv2+
 Summary:        Full-Featured POP and IMAP Mail Retrieval Daemon