diff --git a/CHANGELOG.md b/CHANGELOG.md
index bebeeaafe..95589050f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,51 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- Remove deprecated parameters
+- Drop OVS & LB monolitic plugins
+- Use libreswan on fedora
+- Move rabbit/kombu settings to oslo_messaging_rabbit section
+- FWaaS: update packaging for Debian & Ubuntu
+- Don't specify a nova region by default
+- Do not create tun and int bridges manually
+
+####Features
+- Puppet 4.x support
+- Refactorise Keystone resources management
+- Add 'state_path' and 'lock_path' to neutron class
+- Add service_name parameter to neutron::server class
+- DB: Added postgresql backend using openstacklib helper
+- Subscribe neutron db sync to db connection setting
+- Ensure DB is provisioned before db-sync
+- Add support for identity_uri
+- Notify the ovs-agent service if the config changes
+- Add portdb and fastpath_flood to n1kv.conf
+- Add fwaas package for Kilo in Red Hat platforms
+- Add memcache_servers parameter to base neutron class
+- Add MidoNet plugin support
+- Add PLUMgrid plugin support
+- Add OpenContrail plugin support
+- Tag all neutron packages
+- Allow to configure Nova metadata protocol
+- Configure OVS mechanism agent configs in its config file
+- Don't manage chmod for /etc/neutron and neutron.conf
+- Introduce public_url, internal_url and admin_url
+- Allow customization of dhcp_domain setting
+- Add manage_service parameter to all agents
+- Add ability to specify auth_region
+
+####Bugfixes
+- Fix l3 agent network_device_mtu deprecation
+- Set allow_automatic_l3agent_failover in neutron.conf instead of l3_agent.ini
+- Fix parsing of network gateway id for router
+
+####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 518a59f8c..82c03b422 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 neutron
 ===================================
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
 
 #### Table of Contents
 
diff --git a/metadata.json b/metadata.json
index 4b06568b8..37973491d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-neutron",
-  "version": "5.1.0",
+  "name": "openstack-neutron",
+  "version": "6.0.0",
   "author": "OpenStack Contributors",
   "summary": "Puppet module for OpenStack Neutron",
   "license": "Apache-2.0",
@@ -32,11 +32,11 @@
   "description": "Installs and configures OpenStack Neutron (Networking).",
   "dependencies": [
     { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "stackforge/keystone", "version_requirement": ">=5.0.0 <6.0.0" },
-    { "name": "stackforge/nova", "version_requirement": ">=5.0.0 <6.0.0" },
+    { "name": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
+    { "name": "openstack/nova", "version_requirement": ">=6.0.0 <7.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
-    { "name": "stackforge/vswitch", "version_requirement": ">=1.0.0 <2.0.0" },
+    { "name": "openstack/vswitch", "version_requirement": ">=2.0.0 <3.0.0" },
     { "name": "duritong/sysctl", "version_requirement": ">=0.0.1 <1.0.0" },
-    { "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0 <6.0.0" }
+    { "name": "openstack/openstacklib", "version_requirement": ">=6.0.0 <7.0.0" }
   ]
 }