diff --git a/docs/en/history.rst b/docs/en/history.rst
index 8275b28..3986e86 100644
--- a/docs/en/history.rst
+++ b/docs/en/history.rst
@@ -2,6 +2,20 @@
 Release History
 ===============
 
+2.6
+
+  - Fixed a problem with hook script line endings under Cygwin
+    (:bbissue:`68`).
+  - Updated documentation to include a list of the compatible shells
+    (:ref:`supported-shells`) and Python versions
+    (:ref:`supported-versions`) (:bbissue:`70`).
+  - Fixed installation dependency on virtualenv (:bbissue:`60`).
+  - Fixed the method for determining the Python version so it works
+    under Python 2.4 (:bbissue:`61`).
+  - Converted the test infrastructure to use `tox
+    <http://codespeak.net/tox/index.html>`_ instead of home-grown
+    scripts in the Makefile.
+
 2.5.3
 
   - Point release uploaded to PyPI during outage on doughellmann.com.
diff --git a/docs/en/install.rst b/docs/en/install.rst
index bcfa89a..e07ac0c 100644
--- a/docs/en/install.rst
+++ b/docs/en/install.rst
@@ -2,6 +2,8 @@
 Installation
 ============
 
+.. _supported-shells:
+
 Supported Shells
 ================
 
@@ -14,6 +16,8 @@ request through the bitbucket project page.  If you write a clone to
 work with an incompatible shell, let me know and I will link to it
 from this page.
 
+.. _supported-versions:
+
 Python Versions
 ===============
 
diff --git a/setup.py b/setup.py
index a0f1889..692d8c5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 PROJECT = 'virtualenvwrapper'
-VERSION = '2.5.3'
+VERSION = '2.6'
 
 # Bootstrap installation of Distribute
 import distribute_setup