diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5913be1..e29904be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- Move rabbit/kombu settings to oslo_messaging_rabbit section
+
+####Features
+- Puppet 4.x support
+- make crontab for expirer optional
+- Refactorise Keystone resources management
+- db: Added postgresql backend using openstacklib helper
+- Implement Ceilometer-API as a WSGI process support
+- Add support for ceilometer-polling agent
+- Add support for identity_uri
+- Tag all Ceilometer packages
+- Add udp_address/udp_port parameters for collector.
+- Deprecate old public, internal and admin parameters
+
+####Bugfixes
+- Ensure python-mysqldb is installed before MySQL db_sync
+- Fix dependency on nova-common package
+
+####Maintenance
+- Acceptance tests with Beaker
+- Fix spec tests for RSpec 3.x and Puppet 4.x
+
+
 ##2015-06-17 - 5.1.0
 ###Summary
 
diff --git a/README.md b/README.md
index 7bd699a7..56155b2f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Ceilometer
 ==========
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
 
 #### Table of Contents
 
diff --git a/metadata.json b/metadata.json
index 0b32dd6b..c7d82fc9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-ceilometer",
-  "version": "5.1.0",
+  "name": "openstack-ceilometer",
+  "version": "6.0.0",
   "author": "eNovance and OpenStack Contributors",
   "summary": "Puppet module for OpenStack Ceilometer",
   "license": "Apache-2.0",
@@ -33,8 +33,8 @@
   "dependencies": [
     { "name": "puppetlabs/apache", "version_requirement": ">=1.0.0 <2.0.0" },
     { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "stackforge/keystone", "version_requirement": ">=5.0.0 <6.0.0" },
+    { "name": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
-    { "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0 <6.0.0" }
+    { "name": "openstack/openstacklib", "version_requirement": ">=6.0.0 <7.0.0" }
   ]
 }