diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6c1161ba7..bf297971d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,11 +1,10 @@
-3.0.6.dev0 (unreleased)
+3.0.6 (2017-01-29)
 =======================
 
 * pytest no longer generates ``PendingDeprecationWarning`` from its own operations, which was introduced by mistake in version ``3.0.5`` (`#2118`_).
   Thanks to `@nicoddemus`_ for the report and `@RonnyPfannschmidt`_ for the PR.
 
 
-
 * pytest no longer recognizes coroutine functions as yield tests (`#2129`_).
   Thanks to `@malinoff`_ for the PR.
 
@@ -30,7 +29,6 @@
 * Fail ``testdir.runpytest().assert_outcomes()`` explicitly if the pytest
   terminal output it relies on is missing. Thanks to `@eli-b`_ for the PR.
 
-*
 
 .. _@lesteve: https://github.com/lesteve
 .. _@malinoff: https://github.com/malinoff
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 8546ff02b..a4739a613 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '3.0.6.dev0'
+__version__ = '3.0.6'