diff --git a/CHANGELOG.md b/CHANGELOG.md
index 858d4ab..11401c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,6 @@ This file is used to list changes made in each version of the cookbook-openstack
 ## 10.0.0
 * Upgrading to Juno
 * Upgrading berkshelf from 2.0.18 to 3.1.5
-
 * Bump Chef gem to 11.16
 
 ## 9.0.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..7153493
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,37 @@
+Contributing
+============
+
+How To Get Started
+------------------
+
+If you would like to contribute to the development of OpenStack Chef Cookbooks,
+you must follow the steps in the "If you're a developer"
+section of this page:
+
+   http://wiki.openstack.org/HowToContribute
+
+Gerrit Workflow
+---------------
+
+Once those steps have been completed, changes to OpenStack
+should be submitted for review via the Gerrit tool, following
+the workflow documented at:
+
+   http://wiki.openstack.org/GerritWorkflow
+
+Pull requests submitted through GitHub will be ignored.
+
+Bugs
+----
+
+Bugs should be filed on Launchpad, not GitHub:
+
+   https://bugs.launchpad.net/openstack-chef
+
+Contacts
+--------
+
+Mailing list: groups.google.com/group/opscode-chef-openstack
+IRC: #openstack-chef is our channel on irc.freenode.net
+Wiki: https://wiki.openstack.org/wiki/Chef/GettingStarted and https://docs.getchef.com/openstack.html
+Twitter: @chefopenstack
diff --git a/TESTING.md b/TESTING.md
index b38785b..fa2e9c1 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -27,4 +27,4 @@ The `rake` tasks will take care of installing the needed gem dependencies and co
 
 ## Chefspec
 
-[ChefSpec](http://code.sethvargo.com/chefspec/) is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers.
+[ChefSpec](https://github.com/sethvargo/chefspec/) is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers.
diff --git a/metadata.rb b/metadata.rb
index 9b7a88d..b6b67be 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,6 +1,6 @@
 name             'openstack-database'
-maintainer       'SUSE Linux GmbH'
-maintainer_email 'crowbar@dell.com'
+maintainer       'openstack-chef'
+maintainer_email 'opscode-chef-openstack@googlegroups.com'
 license          'Apache 2.0'
 description      'Installs/Configures trove'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))