diff --git a/CHANGELOG.md b/CHANGELOG.md
index 944eb5df..9c36e17e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- MySQL: change default MySQL collate to utf8_general_ci
+
+####Features
+- Puppet 4.x support
+- Add db::postgresql to openstacklib
+- Implement openstacklib::wsgi::apache
+- Move openstackclient parent provider to openstacklib
+- Keystone V3 API support
+- Restructures authentication for resource providers
+
+####Bugfixes
+- Properly handle policy values containing spaces
+
+####Maintenance
+- Bump mysql version to 3.x
+- Acceptance tests with Beaker
+
 ##2015-06-17 - 5.1.0
 ###Summary
 
diff --git a/README.md b/README.md
index 90fb090d..e97677d1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 openstacklib
 ============
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
+
 #### Table of Contents
 
 1. [Overview - What is the openstacklib module?](#overview)
diff --git a/metadata.json b/metadata.json
index bc79e797..6520213a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-openstacklib",
-  "version": "5.1.0",
+  "name": "openstack-openstacklib",
+  "version": "6.0.0",
   "author": "Puppet Labs and OpenStack Contributors",
   "summary": "Puppet OpenStack Libraries",
   "license": "Apache-2.0",