diff --git a/README.md b/README.md
index 72ba9d3e62f28794304785c5887561da08501035..01a8f6e08ab0659046ca2866dbc298c0c06c0442 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ the future development of Gluon.
 
 Please refrain from using the `master` branch for anything else but development purposes!
 Use the most recent release instead. You can list all relaseses by running `git tag`
-and switch to one by running `git checkout v2016.2.5 && make update`.
+and switch to one by running `git checkout v2016.2.6 && make update`.
 
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *will break* eventually.
diff --git a/docs/conf.py b/docs/conf.py
index c66cbf62a2a4e5063931090cba7de136528e7b61..59b5be81f988206baae0c216e3e9abdd7ca66bbc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -47,7 +47,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Gluon'
-copyright = '2015-2016, Project Gluon'
+copyright = '2015-2017, Project Gluon'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/docs/index.rst b/docs/index.rst
index 03bd216013decfb22864a4cf1a347d7dcf574b12..e509a990b5611251e5f226b4734570ac281ad2ac 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,6 +65,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
    :maxdepth: 1
 
    releases/v2017.1
+   releases/v2016.2.6
    releases/v2016.2.5
    releases/v2016.2.4
    releases/v2016.2.3
diff --git a/docs/releases/v2016.2.6.rst b/docs/releases/v2016.2.6.rst
new file mode 100644
index 0000000000000000000000000000000000000000..fac3f13d05b696dc06a5f9abebf763be7e15530c
--- /dev/null
+++ b/docs/releases/v2016.2.6.rst
@@ -0,0 +1,57 @@
+Gluon 2016.2.6
+==============
+
+Added hardware support
+~~~~~~~~~~~~~~~~~~~~~~
+
+ar71xx-generic
+^^^^^^^^^^^^^^
+
+* TP-Link TL-WR841N/ND v12
+
+Bugfixes
+~~~~~~~~
+
+* Fix `CVE-2016-10229 <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10229>`_
+  (`#1097 <https://github.com/freifunk-gluon/gluon/issues/1097>`_)
+
+  Fortunately, the standard Gluon setup is not vulnerable, as the issue only affects
+  applications that use MSG_PEEK on UDP sockets. dnsmasq does use MSG_PEEK, but
+  only in the DHCP component, which is not enabled during normal node operation.
+
+* Fix roaming issue affecting communication between clients
+  (`#1121 <https://github.com/freifunk-gluon/gluon/issues/1121>`_)
+
+  This issue affects all previous releases of Gluon v2016.2.x.
+
+* Fix build against OpenSSL 1.1 (`b6a22ce <https://github.com/freifunk-gluon/gluon/commit/b6a22ce79307853b175192178bb0333d976a3a6f>`_)
+
+* Fix build with long path names (`#1120 <https://github.com/freifunk-gluon/gluon/issues/1120>`_)
+
+* Use new staged sysupgrade procedure (`d4a69c0 <https://github.com/freifunk-gluon/gluon/commit/d4a69c00047f72696a2400cd7129be032de458e3>`_)
+
+  The new sysupgrade fixes an issue affecting x86, causing nodes to lose their
+  configuration on upgrade when the size of the kernel partition grows. This is
+  the case when upgrading from Gluon v2016.2.x to newer (LEDE-based) Gluon
+  versions. **This means that a Gluon node running an older version must be
+  upgraded to Gluon v2016.2.6 first before switching to a LEDE-based version!**
+
+  One downside of the staged sysupgrade is that all processes, including the SSH
+  server, will be terminated at the start of the sysupgrade to allow unmounting
+  the root filesystem. This makes it impossible to get any feedback from the
+  upgrade process without a serial console.
+
+Known Issues
+~~~~~~~~~~~~
+
+* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
+
+  Reducing the TX power in the Advanced Settings is recommended.
+
+* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
+
+  This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
+
+* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
+
+  The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst
index ccf29f30262c9145ac0c876474b0f4746e90012d..5fa8750df867755722a4bd0e5ed73af5d4a69108 100644
--- a/docs/user/getting_started.rst
+++ b/docs/user/getting_started.rst
@@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
 started with Gluon we recommend to use the latest stable release of Gluon.
 
 Take a look at the `list of gluon releases`_ and notice the latest release,
-e.g. *v2016.2.5*. Always get Gluon using git and don't try to download it
+e.g. *v2016.2.6*. Always get Gluon using git and don't try to download it
 as a Zip archive as the archive will be missing version information.
 
 Please keep in mind that there is no "default Gluon" build; a site configuration
@@ -43,7 +43,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2016.2.5*.
+version you'd like to checkout, e.g. *v2016.2.6*.
 
 ::