diff --git a/vsftpd-2.0.7-use-ipv6-scope-id.patch b/vsftpd-2.0.7-use-ipv6-scope-id.patch
new file mode 100644
index 0000000..6017079
--- /dev/null
+++ b/vsftpd-2.0.7-use-ipv6-scope-id.patch
@@ -0,0 +1,12 @@
+Index: vsftpd-2.0.7/sysutil.c
+===================================================================
+--- vsftpd-2.0.7.orig/sysutil.c	2010-01-28 00:48:21.000000000 +0530
++++ vsftpd-2.0.7/sysutil.c	2010-01-28 00:59:33.000000000 +0530
+@@ -1893,6 +1893,7 @@
+     vsf_sysutil_memcpy(&p_sockaddr->u.u_sockaddr_in6.sin6_addr,
+                        &p_src->u.u_sockaddr_in6.sin6_addr,
+                        sizeof(p_sockaddr->u.u_sockaddr_in6.sin6_addr));
++    p_sockaddr->u.u_sockaddr_in6.sin6_scope_id = p_src->u.u_sockaddr_in6.sin6_scope_id;
+   }
+   else
+   {
diff --git a/vsftpd.changes b/vsftpd.changes
index 1a9d728..160f5e6 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 28 10:42:31 UTC 2010 - mseben@novell.com
+
+- added use-ipv6-scope-id.patch to fix connection issues with
+  ipv6-link local address (bnc#574366)
+
 -------------------------------------------------------------------
 Wed Jan 20 14:13:49 UTC 2010 - coolo@novell.com
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 0daa4b5..dd29d7a 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -26,7 +26,7 @@ BuildRequires:  libcap
 BuildRequires:  libcap-devel
 %endif
 Version:        2.0.7
-Release:        5
+Release:        6
 Summary:        Very Secure FTP Daemon - Written from Scratch
 License:        GPLv2+
 Group:          Productivity/Networking/Ftp/Servers
@@ -49,6 +49,8 @@ Patch7:         %name-2.0.5-enable-debuginfo.patch
 Patch8:         %name-2.0.5-utf8-log-names.patch
 Patch9:         %name-2.0.6-libcap2-fix.diff
 Patch10:        %name-2.0.6-write_race.patch
+#fix connection issues with ipv6-link local address (bnc#574366) fix already in upstream
+Patch11:        %name-2.0.7-use-ipv6-scope-id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ftp-server
 PreReq:         %insserv_prereq /usr/sbin/useradd
@@ -77,6 +79,7 @@ tests.
 %patch9
 %patch10
 %patch
+%patch11 -p1
 
 %build
 rm -f dummyinc/sys/capability.h