diff --git a/.release_notes.tpl b/.release_notes.tpl
index da819c77..a9ad7d42 100644
--- a/.release_notes.tpl
+++ b/.release_notes.tpl
@@ -12,7 +12,6 @@
 {{#commits}}
 * {{{subject}}} - {{{author}}}
 {{#body}}
-
   _{{{body}}}_
 {{/body}}
 
diff --git a/.travis.yml b/.travis.yml
index 60039aa0..15fc389b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,10 @@ after_success:
 - codecov
 
 deploy:
+  provider: pypi
+  user: "blck"
   password:
-    secure: lRAkrxFqkQ4i60iV/x49sDYwT5NYtVi9WF3xaBga1XSI7SGDheWXHj1N2GPABy1nSozzYbB6iDb8Q0tSxibcQAu1senqK3unx5czf34ec7ndhbAucfWTOYCKdM7anIs+kEDBT3lXysC7+5iph71YewaGXzoa4WvSanlcdFwcOdyJ6o2f0FgGw795t/+Gt0xcra7vcjjXbvovTgOs+6yilx8XEpCcQrvz96LKY5h88+Cx1crlTCXGNYLf8oAgzddrMHTqMHNSVVIX6hmvkFYkm2QWTChRD3+QZD//zfUViIkN0YTQAveoDy3nWtrMOVi50nr3cu5Ee/VH8agOs75pgBsfsrxNajCDjMsanB8Kxi3EISW6pBkh6NjjC89LaCEJ61uxG/5lkdK5r9Gb41AU7I7zmIPH8HI6y1bFbkbiJKR1vXb2jccjJGLJF5i7khrS4z64snxSFRBwMEMCbtfVSRL954OkMvIN8VtsZ/bWQy4YGlPKdJ0rmB8FhdhxSTPZNiC7XwDobJmEeFAOfrnfxvhvGGXjMmed0A3LlrEngGC5vamh/lyJ6ZizNpPzrY3z/m1vkdgCcvmoIYb9tmAS+YN+8LGB/MdoNAuq9Ah+ScXENgCoD4bDOunLE1XC6rYYiJp0mjm+4W/fI54m7KViVOcw60P68r/LmplB36vteQ8=
+    secure: "lRAkrxFqkQ4i60iV/x49sDYwT5NYtVi9WF3xaBga1XSI7SGDheWXHj1N2GPABy1nSozzYbB6iDb8Q0tSxibcQAu1senqK3unx5czf34ec7ndhbAucfWTOYCKdM7anIs+kEDBT3lXysC7+5iph71YewaGXzoa4WvSanlcdFwcOdyJ6o2f0FgGw795t/+Gt0xcra7vcjjXbvovTgOs+6yilx8XEpCcQrvz96LKY5h88+Cx1crlTCXGNYLf8oAgzddrMHTqMHNSVVIX6hmvkFYkm2QWTChRD3+QZD//zfUViIkN0YTQAveoDy3nWtrMOVi50nr3cu5Ee/VH8agOs75pgBsfsrxNajCDjMsanB8Kxi3EISW6pBkh6NjjC89LaCEJ61uxG/5lkdK5r9Gb41AU7I7zmIPH8HI6y1bFbkbiJKR1vXb2jccjJGLJF5i7khrS4z64snxSFRBwMEMCbtfVSRL954OkMvIN8VtsZ/bWQy4YGlPKdJ0rmB8FhdhxSTPZNiC7XwDobJmEeFAOfrnfxvhvGGXjMmed0A3LlrEngGC5vamh/lyJ6ZizNpPzrY3z/m1vkdgCcvmoIYb9tmAS+YN+8LGB/MdoNAuq9Ah+ScXENgCoD4bDOunLE1XC6rYYiJp0mjm+4W/fI54m7KViVOcw60P68r/LmplB36vteQ8="
   distributions: "sdist"
   on:
     tags: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d0d1e22..9ce2aaca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Changelog
+
+
 ## 0.6.0 (2017-06-05)
 
 #### New
diff --git a/scripts/make_release b/scripts/make_release
index 74c6b25f..504b48a6 100755
--- a/scripts/make_release
+++ b/scripts/make_release
@@ -7,7 +7,7 @@ cd ..
 version=$(grep -o -E "([0-9]+\.[0-9]+\.[0-9]+)" aiocache/_version.py)
 echo -n "New version number (current is $version): "
 read new_version
-gitchangelog ^$version HEAD | sed "s/Unreleased/$new_version/g" > _release_notes
+gitchangelog ^$version HEAD | sed "s/Unreleased/$new_version (`date +%Y-%m-%d`)/g" > _release_notes
 cat _release_notes
 echo -n "Are you happy with the release notes (if not, modify the ./_release_notes file manually)? (y/n) "
 read answer
@@ -15,7 +15,7 @@ read answer
 if echo "$answer" | grep -iq "^y" ;then
   echo "Generating new release..."
   sed -i "s/$version/$new_version/" aiocache/_version.py
-  sed -i '1s/^/# Changelog\n\n\n/' _release_notes && sed -i '1,4d' CHANGELOG.md && cat CHANGELOG.md >> _release_notes && mv _release_notes CHANGELOG.md
+  sed -i '1s/^/# Changelog\n\n\n/' _release_notes && sed -i '1,3d' CHANGELOG.md && cat CHANGELOG.md >> _release_notes && mv _release_notes CHANGELOG.md
   git add CHANGELOG.md aiocache/_version.py
   git commit -m "Bump version $new_version"
   git tag -a "$new_version" -m "$new_version"