diff --git a/bash-completion-2.0.tar.bz2 b/bash-completion-2.0.tar.bz2
deleted file mode 100644
index ea8b27e..0000000
--- a/bash-completion-2.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804
-size 250560
diff --git a/bash-completion-2.1.patch b/bash-completion-2.1.patch
new file mode 100644
index 0000000..b2b6416
--- /dev/null
+++ b/bash-completion-2.1.patch
@@ -0,0 +1,21 @@
+--- bash_completion
++++ bash_completion	2013-04-23 14:12:26.449469882 +0000
+@@ -1791,12 +1791,13 @@ _longopt()
+     fi
+ }
+ # makeinfo and texi2dvi are defined elsewhere.
+-complete -F _longopt a2ps awk base64 bash bc bison cat colordiff cp csplit \
+-    cut date df diff dir du enscript env expand fmt fold gperf \
++complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat colordiff cp csplit \
++    cut date df diff dir du enscript expand fmt fold gperf \
+     grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
+-    mv netstat nl nm objcopy objdump od paste pr ptx readelf rm rmdir \
+-    sed seq sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
+-    texindex touch tr uname unexpand uniq units vdir wc who
++    mv nl nm objcopy objdump od paste pr ptx readelf rm rmdir \
++    sed sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
++    texindex touch tr unexpand uniq vdir wc who
++complete -F _longopt -o default env netstat seq uname units
+ 
+ declare -A _xspecs
+ _filedir_xspec()
diff --git a/bash-completion-2.1.tar.bz2 b/bash-completion-2.1.tar.bz2
new file mode 100644
index 0000000..e733dd1
--- /dev/null
+++ b/bash-completion-2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f
+size 265329
diff --git a/bash-completion.changes b/bash-completion.changes
index 3718ad5..88474e2 100644
--- a/bash-completion.changes
+++ b/bash-completion.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr 23 14:17:43 UTC 2013 - werner@suse.de
+
+- Update to final 2.1 version
+  + See CHANGES for the full list of changes 
+- Add patch bash-completion-2.1.patch to avoid blanks after during
+  file completion (bnc#717151)
+
 -------------------------------------------------------------------
 Fri Apr 19 17:11:24 UTC 2013 - fcrozat@suse.com
 
diff --git a/bash-completion.spec b/bash-completion.spec
index 8cf7b8e..201ecc2 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -17,7 +17,7 @@
 
 
 Name:           bash-completion
-Version:        2.0
+Version:        2.1
 Release:        0
 Summary:        Programmable Completion for Bash
 License:        GPL-2.0+
@@ -25,6 +25,8 @@ Group:          System/Shells
 Url:            http://bash-completion.alioth.debian.org/
 Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
 Source1:        bash-completion-rpmlintrc
+# PATCH-FIX-UPSTREAM bnc#717151 -- Terminal tab autocompletion error
+Patch0:         %{name}-%{version}.patch
 BuildRequires:  pkg-config
 Requires:       bash
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -36,6 +38,7 @@ of the programmable completion feature of Bash 2.04 and later.
 
 %prep
 %setup -q
+%patch0 -b .p0
 
 %build
 %configure