diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cad5600..52ebaf2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,97 +1,100 @@
-.. changelog:
-
-CHANGES
-=======
-
-* Give up on pbr in the package
-* Try to fix pbr issue with build in travis
-* Retry pbr in setup
-* Update doc with the new Query class
-* Remove sudo in .travis.yml
-* * Fix minor thing in XML request file
-* Allow complex queries with Query
-* Add the tests for test_http_messages and test_query
-* Remove pbr in setup
-* Show log after failure in travis
-* Simplity .travis.yml
-* Update ChangeLog
-* Add MANIFEST.in
-* Simplify the tests in tox
-* Add AUTHORS and ChangeLog
-* Use pbr in the setup
-* Ignore directories for Python packaging
-* Add test_http_messages and test_query in tox
-* Update requirements-dev.txt
-* Rename README.md to README.rst
-* Add tests for Query
-* Implement Query class
-* Remove variables of environment for authentication in offline tests
-* Run tox in .travis.yml
-* Fix the code running the tests
-* Add more complex online tests for query_orders
-* Include requirements.txt
-* Fix .travis.yml
-* Add continuous integration with TravisCI
-* Update quickstart
-* Fix heading in quickstart
-* Update the quickstart section of the documentation
-* Improve query method docstrings
-* Refactor _query
-* Update the documentation
-* Improve the docstrings of some query methods
-* Add Sphinx documentation
-* Fix test_update_client_order_comments
-* Update docstrings for the documentation
-* Add new tests to check that multiple parameters work correctly
-* Remove debug statement
-* Remove old and unused XML files
-* Add offline and online tests for batch operations
-* Fix tests with tox
-* Fixing tests for tox
-* Use the Request.element in request_is_valid to test the requests
-* Fix some offline tests
-* Make the manager authenticate when it is created
-* Fix minor things in the constructor of FnapyManager
-* Set 'results_count' default value to ''
-* Add new offline tests
-* Rewrite offline tests
-* Use context manager for the offline tests
-* Rewrite online tests
-* Add new XML files
-* Test the Request and Response classes
-* Store the XML requests as Request instances
-* Create new XML files
-* Fix minor things
-* Include the response elements in the config
-* Update XML files
-* Create new online tests
-* Implement new functions for the tests
-* Implement new functions in utils
-* Update config
-* Rename XML files
-* Add section on the tests in NOTES.md
-* Add offline tests for orders
-* Add new online tests
-* Fix minor things
-* Add offline tests
-* Update online tests
-* Add the tests
-* Fix minor things
-* Fix _query
+==========
+Change log
+==========
+
+All notable changes to this project will be documented in this file.
+The format is based on `Keep a Changelog`_ and this project adheres to `Semantic Versioning`_.
+
+Unreleased
+==========
+Added
+-----
+* Work with sandbox and real account
+
+Changed
+-------
+* Changed the API for FnapyConnection
+* Set a list of eans as an argument in query_pricing
+
+[0.6.0] - 2016-10-07
+====================
+Changed
+-------
+* Improved Query class
+
+[0.5.1] - 2016-10-04
+====================
+Removed
+-------
+* Really remove BeautifulSoup (bs4) from dependencies
+
+[0.5.0] - 2016-10-04
+====================
+Removed
+-------
+* Remove beautifulsoup dependency
+
+Changed
+-------
+* Improve text extraction from XML
+
+[0.4.3] - 2016-09-29
+====================
+Changed
+-------
+* Raise a FnapyPricingError if offers_data is not empty (in update_offers)
+
+[0.4.2] - 2016-09-28
+====================
+Changed
+-------
+* Update documentation
+
+[0.4.1] - 2016-09-28
+====================
+Added
+-----
+* Implement delete_offers
+
+[0.4.0] - 2016-09-27
+====================
+Changed
+-------
+* Use pricing_query (V2)
+* Check the connection passed to FnapyManager is a FnapyConnection
+* Add a caveat in the README for the requests sent to the sandbox.
+* Improve update_offers
+
+Fixed
+-----
+* Fix Unicode/string confusion bug in Response
+
+[0.2.0] - 2016-09-13
+====================
+
+Added
+-----
+* Support Python 3
+* Implement Query class to allow complex queries
+
+Changed
+-------
 * Update the documentation
-* Add auth_xml to the attributes of FnapyManager
-* Add XML files for the tests
-* Clean utils.py
-* Fix get_order_ids
-* Change attributes names for the requests
-* Fix docstrings
+* Make the manager authenticate when it is created.
 * All the methods return a Response instance
-* Update the Makefile
-* Add tests directory
+* Store the XML requests as Request instances
+
+Fixed
+-----
+* Fixed the packaging
+* Test the Request and Response classes
+* Fix minor things in the constructor of FnapyManager
+
+[0.1.0] - 2016-08-31
+====================
+Added
+-----
 * Create the fnapy package
-* Fix the Makefile
-* Ignore the .konchrc file
-* Update the README
-* Fix README
-* Rename the module fnapy
-* Initial commit
+
+.. _Keep a changelog: http://keepachangelog.com/ 
+.. _Semantic Versioning: http://semver.org/
diff --git a/docs/index.rst b/docs/index.rst
index 3c75f4d..9a34968 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,6 +13,7 @@ Welcome to fnapy's documentation!
 
    quickstart
    api
+   CHANGELOG
 
 
 Indices and tables