diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0337785..e9bb37b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- repo: bump to Kilo by default
+
+####Features
+- Puppet 4.x support
+- Add hash based repository management
+- Add pacemaker provider for HA services
+- Add auth file from openstack repo
+- Support native OS primitive classes in Pacemaker
+- Support cloned resources in Pacemaker
+- auth_file: allow to change the path
+- repo/redhat: manage EPEL with metalink instead of baseurl
+
+####Bugfixes
+- Ensure python-mysqldb is installed before MySQL db_sync
+- Fix dependency on nova-common package
+
+####Maintenance
+- repo/apt: update to support apt 2.1.0 module
+- Increase major bound on puppetlabs-apt
+
 ##2014-11-21 - 5.0.0
 ###Summary
 
diff --git a/README.md b/README.md
index e0488f7..fbbea51 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 openstack_extras
 ============
 
-5.0.0 - 2014.2.0 - Juno
+6.0.0 - 2015.1.0 - Kilo
 
 #### Table of Contents
 
diff --git a/metadata.json b/metadata.json
index 384010a..9794332 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-openstack_extras",
-  "version": "5.0.0",
+  "name": "openstack-openstack_extras",
+  "version": "6.0.0",
   "author": "OpenStack Contributors",
   "summary": "Puppet OpenStack Extras Module",
   "license": "Apache-2.0",