diff --git a/.coveragerc b/.coveragerc
index d3f372093..b68fdefa4 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,6 @@
 [run]
 omit =
-    # this file comes from versioneer and we don’t test it
-    */_version.py
+    skopt/__init__.py
     # these are our tests, don't count them towards coverage
     skopt/tests/*
 
diff --git a/AUTHORS.md b/AUTHORS.md
index 5d1fa66a9..72560aa9a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -11,6 +11,7 @@ Scikit-Optimize is a community effort. Contributors include, in alphabetical ord
 * [Manoj Kumar][mechcoder]
 * [Gilles Louppe][glouppe]
 * [Katie Malone][cmmalone]
+* [Holger Nahrstaedt][holgern]
 * [nel215][nel215]
 * [Mikhail Pak][mp4096]
 * [Iaroslav Shcherbatyi](iaroslav-ai)
@@ -35,3 +36,4 @@ The scikit-optimize logo was a contribution by
 [thomasjpfan]: https://github.com/thomasjpfan
 [mirca]: http://mirca.github.io/
 [iaroslav-ai]: http://iaroslav-ai.github.io/
+[holgern]: https://github.com/holgern
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ffa51a77..7f2e2cb8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,22 @@
 # Release history
+## Version 0.7
+
+### New features
+
+* Models queue has now a customizable size (model_queue_size).
+* Add log-uniform prior to Integer space
+* Support for plotting categorical dimensions
+
+### Bug fixes
+
+* Allow BayesSearchCV to work with sklearn 0.21 
+* Reduce the amount of deprecation warnings in unit tests
+
+### Maintenance
+
+* joblib instead of sklearn.externals.joblib 
+* Improve travis CI unit tests (Different sklearn version are checked)
+* Added `versioneer` support, to keep things simple and to fix pypi deploy
 
 ## Version 0.6
 
diff --git a/LICENSE.md b/LICENSE.md
index d1b5dc972..cf5772813 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 New BSD License
 
-Copyright (c) 2016 - scikit-optimize developers.
+Copyright (c) 2016-2020 The scikit-optimize developers.
 
 All rights reserved.
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 1eaf8192f..95de3d03e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include *.md
 include *.rst
-include versioneer.py
-include skopt/_version.py
+recursive-include doc *
+recursive-include examples *
+include README.rst
\ No newline at end of file
diff --git a/README.rst b/README.rst
index cdf33caa6..8ce67f48b 100644
--- a/README.rst
+++ b/README.rst
@@ -38,7 +38,7 @@ Important links
 Install
 -------
 
-The latest released version of scikit-optimize is v0.6, which you can install
+The latest released version of scikit-optimize is v0.7, which you can install
 with:
 ::
 
@@ -136,7 +136,6 @@ The release procedure is almost completely automated. By tagging a new release
 travis will build all required packages and push them to PyPI. To make a release
 create a new issue and work through the following checklist:
 
-* update the version tag in ``setup.py``
 * update the version tag in ``__init__.py``
 * update the version tag mentioned in the README
 * check if the dependencies in ``setup.py`` are valid or need unpinning
@@ -147,7 +146,7 @@ create a new issue and work through the following checklist:
 
 Before making a release we usually create a release candidate. If the next
 release is v0.X then the release candidate should be tagged v0.Xrc1 in
-``setup.py`` and ``__init__.py``. Mark a release candidate as a "pre-release"
+``__init__.py``. Mark a release candidate as a "pre-release"
 on GitHub when you tag it.
 
 
diff --git a/doc/conf.py b/doc/conf.py
index 08db000e6..dd39f94ae 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,7 +41,7 @@
 # The short X.Y version
 version = __version__
 # The full version, including alpha/beta/rc tags
-release = "v" + str(float(__version__.split("+")[0][1:]) + 0.1)
+release = __version__
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/doc/whats_new/v0.7.rst b/doc/whats_new/v0.7.rst
index e64d41df9..e52974e44 100644
--- a/doc/whats_new/v0.7.rst
+++ b/doc/whats_new/v0.7.rst
@@ -4,9 +4,19 @@ Version 0.7
 New features
 ------------
 
+* Models queue has now a customizable size (model_queue_size).
+* Add log-uniform prior to Integer space
+* Support for plotting categorical dimensions
+
 Bug fixes
 ---------
-* Fixed build with newest scikit-learn
+
+* Allow BayesSearchCV to work with sklearn 0.21
+* Reduce the amount of deprecation warnings in unit tests
 
 Maintenance
 -----------
+
+* joblib instead of sklearn.externals.joblib
+* Improve travis CI unit tests (Different sklearn version are checked)
+* Added `versioneer` support, to keep things simple and to fix pypi deploy
diff --git a/skopt/__init__.py b/skopt/__init__.py
index a5f4d531f..b98a981c5 100644
--- a/skopt/__init__.py
+++ b/skopt/__init__.py
@@ -45,7 +45,6 @@ def f(x):
 
 Run the tests by executing `pytest` in the top level directory.
 """
-import sys
 try:
     # This variable is injected in the __builtins__ by the build
     # process. It is used to enable importing subpackages of sklearn when
@@ -71,10 +70,10 @@ def f(x):
 # Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
 # 'X.Y.dev0' is the canonical version of 'X.Y.dev'
 #
-__version__ = "0.7rc4"
-
+__version__ = "0.7"
 
 if __SKOPT_SETUP__:
+    import sys
     sys.stderr.write('Partial import of skopt during the build process.\n')
     # We are not importing the rest of scikit-optimize during the build
     # process, as it may not be compiled yet