diff --git a/.travis.yml b/.travis.yml
index e69ffd02fb9..a0f29174742 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ install:
   - sudo apt-get install enchant
   - pip install --upgrade pip wheel
   - pip install --upgrade setuptools
+  - pip install --upgrade setuptools-git
   - pip install -r requirements-ci.txt
   - pip install aiodns
   - pip install codecov
diff --git a/CHANGES.rst b/CHANGES.rst
index 5bedf6af517..93335de34b5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,17 @@
 Changes
 =======
 
+2.0.7 (2017-04-12)
+------------------
+
+- Fix pypi distribution
+
+- Fix exception description #1807
+
+- Handle socket error in FileResponse #1773
+
+- Cancel websocket heartbeat on close #1793
+
 
 2.0.6 (2017-04-06)
 ------------------
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index 0d07afb316a..516270b3099 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.0.6'
+__version__ = '2.0.7'
 
 # This relies on each of the submodules having an __all__ variable.