diff --git a/README-security.txt b/README-security.txt
new file mode 100644
index 0000000..464f061
--- /dev/null
+++ b/README-security.txt
@@ -0,0 +1,3 @@
+Fetchmail upstream provides detailed description of known security issues which
+can not be distributed due to legal reasons, but is available at
+http://www.fetchmail.info/security.html
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-repacked.tar.bz2 b/fetchmail-6.3.21-repacked.tar.bz2
new file mode 100644
index 0000000..2321db6
--- /dev/null
+++ b/fetchmail-6.3.21-repacked.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f9438792d9ead2e2fdc682eb122b6944df7a25b2c391dc0880c61150bdf0da9
+size 1658317
diff --git a/fetchmail.changes b/fetchmail.changes
index 73d0154..424d899 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Aug 30 09:09:49 UTC 2011 - puzel@suse.com
+
+- repack upstream tarball without fetchmail-{SA,EN}-*.txt
+  (bnc#713698)
+- add README-security.txt
+
+-------------------------------------------------------------------
+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
+
+- license update:  GPLv2+
+  remove licenses " Other uncritical OpenSource License ; Public Domain,
+  Freeware"
+
 -------------------------------------------------------------------
 Mon Jun  6 13:52:08 UTC 2011 - puzel@novell.com
 
diff --git a/fetchmail.spec b/fetchmail.spec
index ff89af5..655670e 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -30,16 +30,19 @@ BuildRequires:  python-devel
 %if 0%{?with_krb5}
 BuildRequires:  krb5-devel
 %endif
-Version:        6.3.20
+Version:        6.3.21
 Release:        1
-License:        GPLv2+ ; Other uncritical OpenSource License ; Public Domain, Freeware
+License:        GPLv2+
 Summary:        Full-Featured POP and IMAP Mail Retrieval Daemon
 Url:            http://fetchmail.berlios.de/
 Group:          Productivity/Networking/Email/Utilities
-Source:         %{name}-%{version}.tar.bz2
+# Always repack upstream tarball without fetchmail-{EN,SA}-*.txt
+# bnc#713698
+Source:         %{name}-%{version}-repacked.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.logrotate
 Source3:        sysconfig.%{name}
+Source4:        README-security.txt
 Patch0:         fetchmail-6.3.8-smtp_errors.patch
 PreReq:         %fillup_prereq
 PreReq:         %insserv_prereq
@@ -63,7 +66,7 @@ fetchmailconf, an interactive GUI configurator suitable for end-users,
 is included in the fetchmailconf package.
 
 %package -n fetchmailconf
-License:        GPLv2+
+License:         GPLv2+
 Summary:        Fetchmail Configuration Utility
 Group:          Productivity/Networking/Email/Utilities
 Requires:       %{name} = %{version}
@@ -74,9 +77,9 @@ A GUI configuration utility for generating fetchmail configuration
 files (.fetchmailrc).
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch0 -p1
-cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} .
+cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
 %build
 %if 0%{?suse_version} > 1010