diff --git a/FOO-dir-completion-boo905348.patch b/FOO-dir-completion-boo905348.patch
index 76220c6..c633674 100644
--- a/FOO-dir-completion-boo905348.patch
+++ b/FOO-dir-completion-boo905348.patch
@@ -3,8 +3,8 @@
  1 file changed, 46 insertions(+), 1 deletion(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 09:23:57.869438668 +0000
-@@ -559,6 +559,7 @@ _filedir()
++++ bash_completion	2017-07-04 07:44:47.556933294 +0000
+@@ -551,6 +551,7 @@ _filedir()
      local IFS=$'\n'
  
      _tilde "$cur" || return
@@ -12,7 +12,7 @@
  
      local -a toks
      local x tmp
-@@ -986,6 +987,41 @@ _tilde()
+@@ -979,6 +980,41 @@ _tilde()
      return $result
  }
  
@@ -54,7 +54,7 @@
  
  # Expand variable starting with tilde (~)
  # We want to expand ~foo/... to /home/foo/... to avoid problems when
-@@ -1634,7 +1670,16 @@ complete -F _known_hosts traceroute trac
+@@ -1666,7 +1702,16 @@ complete -F _known_hosts traceroute trac
  _cd()
  {
      local cur prev words cword
diff --git a/PS1-completion-boo903362.patch b/PS1-completion-boo903362.patch
index 72b6958..83a18ce 100644
--- a/PS1-completion-boo903362.patch
+++ b/PS1-completion-boo903362.patch
@@ -3,11 +3,11 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- bash_completion.sh.in
-+++ bash_completion.sh.in	2016-12-14 08:58:03.572501304 +0000
++++ bash_completion.sh.in	2017-07-04 07:42:39.171304553 +0000
 @@ -1,5 +1,5 @@
  # Check for interactive bash and that we haven't already been sourced.
--if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_COMPAT_DIR-}" ]; then
-+if [[ -n "${BASH_VERSION-}" && $- =~ i && -z "${BASH_COMPLETION_COMPAT_DIR-}" ]]; then
+-if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
++if [[ -n "${BASH_VERSION-}" && $- =~ i && -z "${BASH_COMPLETION_VERSINFO-}" ]]; then
  
      # Check for recent enough version of bash.
      if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
diff --git a/backtick-completion-boo940835.patch b/backtick-completion-boo940835.patch
index 8a88e1e..4d4bac4 100644
--- a/backtick-completion-boo940835.patch
+++ b/backtick-completion-boo940835.patch
@@ -3,8 +3,8 @@
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 09:32:27.123314170 +0000
-@@ -994,16 +994,21 @@ _tilde()
++++ bash_completion	2017-07-04 07:46:01.087575561 +0000
+@@ -987,16 +987,21 @@ _tilde()
  _dollar()
  {
      local s=""
@@ -30,7 +30,7 @@
      \$\{*)
          COMPREPLY=($(compgen -v -P '${' -S "}$s" -- ${1#??})) ;;
      \$*)
-@@ -1015,7 +1020,7 @@ _dollar()
+@@ -1008,7 +1013,7 @@ _dollar()
  
      if ((${#COMPREPLY[@]} > 0)) ; then
          ((${#COMPREPLY[@]} == 1)) && eval COMPREPLY=\(${COMPREPLY[@]}\)
diff --git a/backticks-bsc963140.patch b/backticks-bsc963140.patch
index 3b732da..9700f1b 100644
--- a/backticks-bsc963140.patch
+++ b/backticks-bsc963140.patch
@@ -1,10 +1,10 @@
 ---
- bash-completion-2.4/bash_completion |   20 ++++++++++++++------
+ bash-completion-2.7/bash_completion |   20 ++++++++++++++------
  1 file changed, 14 insertions(+), 6 deletions(-)
 
---- bash-completion-2.4/bash_completion
-+++ bash-completion-2.4/bash_completion	2016-12-14 10:29:18.799435205 +0000
-@@ -1001,13 +1001,21 @@ _dollar()
+--- bash-completion-2.7/bash_completion
++++ bash-completion-2.7/bash_completion	2017-07-04 07:49:14.823999472 +0000
+@@ -994,13 +994,21 @@ _dollar()
      [[ "$COMP_LINE" == cd* ]] && s="/"
  
      case "$1" in
@@ -30,7 +30,7 @@
          ;;
      \$\{*)
          COMPREPLY=($(compgen -v -P '${' -S "}$s" -- ${1#??})) ;;
-@@ -1020,8 +1028,8 @@ _dollar()
+@@ -1013,8 +1021,8 @@ _dollar()
  
      if ((${#COMPREPLY[@]} > 0)) ; then
          ((${#COMPREPLY[@]} == 1)) && eval COMPREPLY=\(${COMPREPLY[@]}\)
diff --git a/bash-completion-2.4.patch b/bash-completion-2.4.patch
index 2ded4e9..25da2b8 100644
--- a/bash-completion-2.4.patch
+++ b/bash-completion-2.4.patch
@@ -3,8 +3,8 @@
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 08:24:22.136927047 +0000
-@@ -1849,12 +1849,13 @@ _longopt()
++++ bash_completion	2017-07-04 07:40:15.221922680 +0000
+@@ -1881,12 +1881,13 @@ _longopt()
      fi
  }
  # makeinfo and texi2dvi are defined elsewhere.
diff --git a/bash-completion-2.5.tar.xz b/bash-completion-2.5.tar.xz
deleted file mode 100644
index 829f598..0000000
--- a/bash-completion-2.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf
-size 276732
diff --git a/bash-completion-2.7.tar.xz b/bash-completion-2.7.tar.xz
new file mode 100644
index 0000000..852cf7a
--- /dev/null
+++ b/bash-completion-2.7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e
+size 280048
diff --git a/bash-completion-doc.changes b/bash-completion-doc.changes
index eef05c3..8c20a3f 100644
--- a/bash-completion-doc.changes
+++ b/bash-completion-doc.changes
@@ -1,3 +1,121 @@
+-------------------------------------------------------------------
+Tue Jul  4 07:51:31 UTC 2017 - werner@suse.de
+
+- Update to version 2.7
+  * Makefile: update default compatdir (#132)
+  * Make user completion file configurable, disable in tests
+  * test suite: Generalize xspec completion install check
+  * pyflakes: Remove redundant xspec completion
+  * test suite: Fix __expand_tilde_by_ref test expectation output
+  * pdfunite: New *.pdf completion
+  + bash-completion (2.6)
+  * Add missing sidedoor to .gitignore (#114)
+  * test suite: Mark expected centos6 CI _filedir failures as such
+  * Expose version in BASH_COMPLETION_VERSINFO, use it in profile.d
+    script
+  * test suite: Skip an expected make test case failure in centos6 CI
+  * test suite: Fix ifdown and ifup CI test skipping
+  * test suite: Ignore env var pulled in by use of scp in tests
+  * test suite: If colon trim doesn't do anything, trim as usual
+  * tar: Comment spelling fixes
+  * test suite: Mark dpkg -L test case untested if no packages
+    installed
+  * test suite: Cosmetic tweaks
+  * dpkg: Fix dpkg -i home dir completion
+  * test suite: Improve ls home dir test descriptions
+  * python: Split module completion to separate helper
+  * micropython: New completion, aliased from python
+  * test suite: Add Python module completion test case
+  * python: Fix traceback avoidance on module completion error
+  * openssl: Parse available digests from dgst -h
+  * openssl: Add sha2 commands
+  * gm: New completion, commands only for now
+  * (test suite): Test screen -T completions
+  * (test suite): Set TERM to dumb, not dummy
+  * Revert "(test suite): Fix alias and cd cursor position tests"
+  * mplayer: Remove duplicate *.m4a and *.m4v associations
+  * mplayer, xine, etc: Associate *.mp4a and *.mp4v
+  * xine etc: Fix *.m4a association
+  * bind: Add option and argument (non-)completions
+  * _user_at_host: Set nospace only when completing username part
+  * _user_at_host: Append @ suffix to username part completions
+  * man: Don't check OSTYPE or GNU userland, just enable on all
+    systems
+  * (test suite): Set dcop result to untested if dcop server is not
+    running
+  * (test suite): Don't insist on loading all completions dynamically
+  * _configured_interfaces: Parse from /etc/network/interfaces.d/* on
+    Debian
+  * py.test: New completion
+  * oowriter: Associate with *.pdf
+  * Don't define BASH_COMPLETION_COMPAT_DIR
+  * ri: Add option and arg completions
+  * (test suite): Add our own dummy ri test fixture
+  * (test suite): Info test needs docs, don't exclude from CentOS
+  * (test suite): Fix CentOS 6 tcllib setup
+  * (test suite): Simplify renice test, fix with only one completion
+  * (test suite): Don't assume configured interfaces in CI setups
+  * Don't offer * as configured interface when there are none
+  * (test suite): Add basic CentOS 6 container for bash 4.1 coverage
+  * (test suite): Ignore runtime loaded env function changes
+  * (test suite): Add mailman bin dir to PATH for arch test
+  * arch: Parse options from --help
+  * (test suite): Load tested completions dynamically
+  * (test suite): Accept non-whitespace single word in
+    assert_complete_any
+  * (test suite): Avoid interference from user and system dirs (#87)
+  * (test suite): Install some things N/A in ubuntu14 to fedoradev
+  * (test suite): Add unrar to ubuntu14 container
+  * (test suite): Fix alias and cd cursor position tests
+  * (test suite): Add basic alpine test case
+  * alpine: Parse opts from -h output, add some opt arg completions
+  * (test suite): Install jshint globally in ubuntu14
+  * (test suite): Add mailman bin dir to PATH for some mailman tools
+  * (test suite): Install jshint to ubuntu14 container with npm
+  * unshunt: Parse options from --help
+  * (test suite): Test lsof on ubuntu14
+  * (test suite): Add basic hping3 test case
+  * (test suite): Add our ./configure to PATH to test it, test opts
+  * (test suite): Add bunch of packages to ubuntu14 container
+  * (test suite): Ensure /usr/(local/)games is in $PATH
+  * (test suite): Fix perl -d* test cases with no Devel::* installed
+  * (test suite): curl has lots of options, add more test prefix
+  * (test suite): Fix tar test case for ones having --owner-map
+  * (test suite): Unsupport various kill, renice cases if ps is N/A
+  * (test suite): Make chkconfig test behave better in container
+  * (test suite): Don't assume mounted filesystems in quota* tests
+  * newlist: Parse options from --help, add some arg non-completions
+  * (test suite): Delete trailing whitespace
+  * (test suite): Don't assume lists set up in newlist test cases
+  * (docker): Pull in missing fedoradev xvfb-run which dependency
+  * mr: Avoid stderr trash and test suite failure if man is N/A
+  * (test suite): Fix mmsitepass completion test
+  * tshark -G: Avoid stderr noise when running as superuser
+  * (docker): Run completion tests with xvfb-run, e.g. for gkrellm
+  * ssh-keygen: Make option parsing work with OpenSSH < 7
+  * synclient, udevadm: Avoid use of posix char classes for awk
+  * test suite: Add WIP Fedora dev config
+  * Travis: Switch tests to docker, update to Ubuntu 14
+  * xv: Associate with *.j2c, *.j2k, *.jp2, *.jpf, and *.jpg2 (Debian:
+    #859774)
+  * eog: Associate with *.j2c and *.jpg2
+  * Bump copyright years
+  * xine etc: Associate uppercase *.WM[AV]
+  * mplayer: Associate *.weba (#112)
+  * xine etc: Associate *.webm and *.weba (#112)
+- Modify patches
+  * FOO-dir-completion-boo905348.patch
+  * PS1-completion-boo903362.patch
+  * backtick-completion-boo940835.patch
+  * backticks-bsc963140.patch
+  * bash-completion-2.4.patch
+  * bash-completion.changes
+  * bash-completion.spec
+  * ls-completion-boo889319.patch
+  * respect-variables-boo940837.patch
+  * rm-completion-smart-boo958462.patch
+  * sh-script-completion-boo977336.patch
+
 -------------------------------------------------------------------
 Tue May 30 15:59:01 UTC 2017 - nico.kruber@gmail.com
 
diff --git a/bash-completion-doc.spec b/bash-completion-doc.spec
index 1101338..1b37eee 100644
--- a/bash-completion-doc.spec
+++ b/bash-completion-doc.spec
@@ -20,7 +20,7 @@ Name:           bash-completion-doc
 %define _name bash-completion
 # WARNING: Never edit this file!!! Edit bash-completion.spec and call pre_checkin.sh to update bash-completion-doc.spec.
 # Always set %%build_doc to 0 before submit to OBS.
-Version:        2.5
+Version:        2.7
 Release:        0
 Summary:        The Documentation of Programmable Completion for Bash
 License:        GPL-2.0+
@@ -63,7 +63,7 @@ package bash-completion.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -b .p0
-%patch1 -b .p0
+%patch1 -b .p1
 %patch2 -b .p2
 %patch3 -b .p3
 %patch5 -b .p5
diff --git a/bash-completion.changes b/bash-completion.changes
index eef05c3..8c20a3f 100644
--- a/bash-completion.changes
+++ b/bash-completion.changes
@@ -1,3 +1,121 @@
+-------------------------------------------------------------------
+Tue Jul  4 07:51:31 UTC 2017 - werner@suse.de
+
+- Update to version 2.7
+  * Makefile: update default compatdir (#132)
+  * Make user completion file configurable, disable in tests
+  * test suite: Generalize xspec completion install check
+  * pyflakes: Remove redundant xspec completion
+  * test suite: Fix __expand_tilde_by_ref test expectation output
+  * pdfunite: New *.pdf completion
+  + bash-completion (2.6)
+  * Add missing sidedoor to .gitignore (#114)
+  * test suite: Mark expected centos6 CI _filedir failures as such
+  * Expose version in BASH_COMPLETION_VERSINFO, use it in profile.d
+    script
+  * test suite: Skip an expected make test case failure in centos6 CI
+  * test suite: Fix ifdown and ifup CI test skipping
+  * test suite: Ignore env var pulled in by use of scp in tests
+  * test suite: If colon trim doesn't do anything, trim as usual
+  * tar: Comment spelling fixes
+  * test suite: Mark dpkg -L test case untested if no packages
+    installed
+  * test suite: Cosmetic tweaks
+  * dpkg: Fix dpkg -i home dir completion
+  * test suite: Improve ls home dir test descriptions
+  * python: Split module completion to separate helper
+  * micropython: New completion, aliased from python
+  * test suite: Add Python module completion test case
+  * python: Fix traceback avoidance on module completion error
+  * openssl: Parse available digests from dgst -h
+  * openssl: Add sha2 commands
+  * gm: New completion, commands only for now
+  * (test suite): Test screen -T completions
+  * (test suite): Set TERM to dumb, not dummy
+  * Revert "(test suite): Fix alias and cd cursor position tests"
+  * mplayer: Remove duplicate *.m4a and *.m4v associations
+  * mplayer, xine, etc: Associate *.mp4a and *.mp4v
+  * xine etc: Fix *.m4a association
+  * bind: Add option and argument (non-)completions
+  * _user_at_host: Set nospace only when completing username part
+  * _user_at_host: Append @ suffix to username part completions
+  * man: Don't check OSTYPE or GNU userland, just enable on all
+    systems
+  * (test suite): Set dcop result to untested if dcop server is not
+    running
+  * (test suite): Don't insist on loading all completions dynamically
+  * _configured_interfaces: Parse from /etc/network/interfaces.d/* on
+    Debian
+  * py.test: New completion
+  * oowriter: Associate with *.pdf
+  * Don't define BASH_COMPLETION_COMPAT_DIR
+  * ri: Add option and arg completions
+  * (test suite): Add our own dummy ri test fixture
+  * (test suite): Info test needs docs, don't exclude from CentOS
+  * (test suite): Fix CentOS 6 tcllib setup
+  * (test suite): Simplify renice test, fix with only one completion
+  * (test suite): Don't assume configured interfaces in CI setups
+  * Don't offer * as configured interface when there are none
+  * (test suite): Add basic CentOS 6 container for bash 4.1 coverage
+  * (test suite): Ignore runtime loaded env function changes
+  * (test suite): Add mailman bin dir to PATH for arch test
+  * arch: Parse options from --help
+  * (test suite): Load tested completions dynamically
+  * (test suite): Accept non-whitespace single word in
+    assert_complete_any
+  * (test suite): Avoid interference from user and system dirs (#87)
+  * (test suite): Install some things N/A in ubuntu14 to fedoradev
+  * (test suite): Add unrar to ubuntu14 container
+  * (test suite): Fix alias and cd cursor position tests
+  * (test suite): Add basic alpine test case
+  * alpine: Parse opts from -h output, add some opt arg completions
+  * (test suite): Install jshint globally in ubuntu14
+  * (test suite): Add mailman bin dir to PATH for some mailman tools
+  * (test suite): Install jshint to ubuntu14 container with npm
+  * unshunt: Parse options from --help
+  * (test suite): Test lsof on ubuntu14
+  * (test suite): Add basic hping3 test case
+  * (test suite): Add our ./configure to PATH to test it, test opts
+  * (test suite): Add bunch of packages to ubuntu14 container
+  * (test suite): Ensure /usr/(local/)games is in $PATH
+  * (test suite): Fix perl -d* test cases with no Devel::* installed
+  * (test suite): curl has lots of options, add more test prefix
+  * (test suite): Fix tar test case for ones having --owner-map
+  * (test suite): Unsupport various kill, renice cases if ps is N/A
+  * (test suite): Make chkconfig test behave better in container
+  * (test suite): Don't assume mounted filesystems in quota* tests
+  * newlist: Parse options from --help, add some arg non-completions
+  * (test suite): Delete trailing whitespace
+  * (test suite): Don't assume lists set up in newlist test cases
+  * (docker): Pull in missing fedoradev xvfb-run which dependency
+  * mr: Avoid stderr trash and test suite failure if man is N/A
+  * (test suite): Fix mmsitepass completion test
+  * tshark -G: Avoid stderr noise when running as superuser
+  * (docker): Run completion tests with xvfb-run, e.g. for gkrellm
+  * ssh-keygen: Make option parsing work with OpenSSH < 7
+  * synclient, udevadm: Avoid use of posix char classes for awk
+  * test suite: Add WIP Fedora dev config
+  * Travis: Switch tests to docker, update to Ubuntu 14
+  * xv: Associate with *.j2c, *.j2k, *.jp2, *.jpf, and *.jpg2 (Debian:
+    #859774)
+  * eog: Associate with *.j2c and *.jpg2
+  * Bump copyright years
+  * xine etc: Associate uppercase *.WM[AV]
+  * mplayer: Associate *.weba (#112)
+  * xine etc: Associate *.webm and *.weba (#112)
+- Modify patches
+  * FOO-dir-completion-boo905348.patch
+  * PS1-completion-boo903362.patch
+  * backtick-completion-boo940835.patch
+  * backticks-bsc963140.patch
+  * bash-completion-2.4.patch
+  * bash-completion.changes
+  * bash-completion.spec
+  * ls-completion-boo889319.patch
+  * respect-variables-boo940837.patch
+  * rm-completion-smart-boo958462.patch
+  * sh-script-completion-boo977336.patch
+
 -------------------------------------------------------------------
 Tue May 30 15:59:01 UTC 2017 - nico.kruber@gmail.com
 
diff --git a/bash-completion.spec b/bash-completion.spec
index f249423..9f9f24b 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -22,7 +22,7 @@ Name:           bash-completion
 %define build_core 1
 # Always set %%build_doc to 0 before submit to OBS.
 %define build_doc 0
-Version:        2.5
+Version:        2.7
 Release:        0
 Summary:        Programmable Completion for Bash
 License:        GPL-2.0+
@@ -95,7 +95,7 @@ package bash-completion.
 %prep
 %setup -q
 %patch0 -b .p0
-%patch1 -b .p0
+%patch1 -b .p1
 %patch2 -b .p2
 %patch3 -b .p3
 %patch5 -b .p5
diff --git a/ls-completion-boo889319.patch b/ls-completion-boo889319.patch
index ce1a83c..9eaf188 100644
--- a/ls-completion-boo889319.patch
+++ b/ls-completion-boo889319.patch
@@ -3,8 +3,8 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 09:29:59.066258452 +0000
-@@ -1896,11 +1896,12 @@ _longopt()
++++ bash_completion	2017-07-04 07:45:25.480233012 +0000
+@@ -1928,11 +1928,12 @@ _longopt()
  # makeinfo and texi2dvi are defined elsewhere.
  complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat chroot colordiff cp \
      csplit cut date df diff dir du enscript expand fmt fold gperf \
diff --git a/respect-variables-boo940837.patch b/respect-variables-boo940837.patch
index 8a080ee..4ee8118 100644
--- a/respect-variables-boo940837.patch
+++ b/respect-variables-boo940837.patch
@@ -9,8 +9,8 @@ commands like `ls' to go further in its completion chain.
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 10:22:02.200138796 +0000
-@@ -1854,8 +1854,19 @@ _complete_as_root()
++++ bash_completion	2017-07-04 07:47:32.437889150 +0000
+@@ -1886,8 +1886,19 @@ _complete_as_root()
  
  _longopt()
  {
diff --git a/rm-completion-smart-boo958462.patch b/rm-completion-smart-boo958462.patch
index 25a06d6..dffae63 100644
--- a/rm-completion-smart-boo958462.patch
+++ b/rm-completion-smart-boo958462.patch
@@ -8,8 +8,8 @@ does not return anything.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 10:27:19.377816132 +0000
-@@ -1913,11 +1913,13 @@ _longopt()
++++ bash_completion	2017-07-04 07:48:24.632925756 +0000
+@@ -1945,11 +1945,13 @@ _longopt()
  complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat chroot colordiff cp \
      csplit cut date df diff dir du enscript expand fmt fold gperf \
      grep grub head irb ld ldd less ln m4 md5sum mkdir mkfifo mknod \
diff --git a/sh-script-completion-boo977336.patch b/sh-script-completion-boo977336.patch
index 553ec6c..aa9a15a 100644
--- a/sh-script-completion-boo977336.patch
+++ b/sh-script-completion-boo977336.patch
@@ -6,8 +6,8 @@ local sub directories exists (boo#977336)
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 --- bash_completion
-+++ bash_completion	2016-12-14 10:44:34.717186388 +0000
-@@ -564,11 +564,6 @@ _filedir()
++++ bash_completion	2017-07-04 07:50:05.763059501 +0000
+@@ -556,11 +556,6 @@ _filedir()
      local -a toks
      local x tmp
  
@@ -19,7 +19,7 @@ local sub directories exists (boo#977336)
      if [[ "$1" != -d ]]; then
          local quoted
          _quote_readline_by_ref "$cur" quoted
-@@ -589,6 +584,11 @@ _filedir()
+@@ -581,6 +576,11 @@ _filedir()
              done <<< "$x"
      fi