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/README.md b/README.md
index 62b802c..e59d468 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,7 @@ License and Author
 | **Author**           |  Zhao Fang Han (<hanzhf@cn.ibm.com>)               |
 | **Author**           |  Chen Zhiwei (<zhiwchen@cn.ibm.com>)               |
 | **Author**           |  Ionut Artarisi (<iartarisi@suse.cz>)              |
+| **Author**           |  Mark Vanderwiel (<vanderwl@us.ibm.com>)           |
 |                      |                                                    |
 | **Copyright**        |  Copyright (c) 2013-2014, IBM Corp.                |
 | **Copyright**        |  Copyright (c) 2014, SUSE Linux, GmbH.             |
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 f19610b..95953f9 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,6 +1,7 @@
 # encoding: UTF-8
 name              'openstack-orchestration'
-maintainer        'IBM, Inc.'
+maintainer       'openstack-chef'
+maintainer_email 'opscode-chef-openstack@googlegroups.com'
 license           'Apache 2.0'
 description       'Installs and configures the Heat Service'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))