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.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-6.3.21.tar.bz2 b/fetchmail-6.3.21.tar.bz2
deleted file mode 100644
index 04a5b97..0000000
--- a/fetchmail-6.3.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b20eededa7d15ab2bde2d4a0c2d169d4882021cd63042ecbed2f13999185502
-size 1724445
diff --git a/fetchmail.changes b/fetchmail.changes
index c5b426b..424d899 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 21917f3..655670e 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -36,10 +36,13 @@ 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
@@ -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