Prepare 1.1.0 release1.1.0

2 files changed, 18 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa6739d..ac68960 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,26 @@
-# Change Log
+CHANGELOG
+=========
 
-This document records all notable changes to Watson. This project adheres to [Semantic Versioning](http://semver.org/).
+This document records all notable changes to Watson. This project adheres to
+[Semantic Versioning](http://semver.org/).
+
+## 1.1.0 (2015-10-21)
+
+* Added: configurable date and time to output of `status` command (#33)
+* Added: support for Bash-completion (#1)
+* Added: new `frames` command that displays all frame IDs
+* Fixed: set id if not provided (#30)
 
 ## 1.0.2 (2015-10-09)
 
-- Fix a bug where the last frame could not be deleted
-- Improve installation instructions
-- Add an explanation to remove all the frames
+* Fix a bug where the last frame could not be deleted
+* Improve installation instructions
+* Add an explanation to remove all the frames
 
 ## 1.0.1 (2015-09-17)
 
-Fix packaging error with PyPI
+* Fix packaging error with PyPI
 
 ## 1.0.0 (2015-09-17)
 
-First stable version
+* First stable version
diff --git a/setup.py b/setup.py
index c0a5e5b..2894617 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,12 @@
 from setuptools import setup
 
-with open('README.md') as f:
+with open('README.rst') as f:
     readme = f.read()
 
 
 setup(
     name='td-watson',
-    version='1.0.2',
+    version='1.1.0',
     packages=['watson'],
     author='TailorDev',
     author_email='contact@tailordev.com',