diff --git a/CHANGES b/CHANGES
index bfa35af3ad4..081f09e183d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,105 @@
+bash-completion (2.6)
+
+  [ Björn Kautler ]
+  * Add missing sidedoor to .gitignore (#114)
+
+  [ Ville Skyttä ]
+  * 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)
+
+ -- Ville Skyttä <ville.skytta@iki.fi>  Tue, 27 Jun 2017 12:29:33 +0300
+
 bash-completion (2.5)
 
   [ BartDeWaal ]
diff --git a/bash_completion b/bash_completion
index 52cdf97af08..698491f5447 100644
--- a/bash_completion
+++ b/bash_completion
@@ -23,7 +23,7 @@
 #
 #   https://github.com/scop/bash-completion
 
-BASH_COMPLETION_VERSINFO=(2 5)
+BASH_COMPLETION_VERSINFO=(2 6)
 
 if [[ $- == *v* ]]; then
     BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
diff --git a/configure.ac b/configure.ac
index 541ff0f004c..a244fbc87b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([bash-completion], [2.5])
+AC_INIT([bash-completion], [2.6])
 AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip -Wall -Werror])
 AC_PROG_LN_S
 AC_PROG_MKDIR_P