diff --git a/.gitignore b/.gitignore
index 8c00a70..da6f727 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ metadata.json
 coverage/
 spec/fixtures/modules/*
 Gemfile.lock
+.bundle
+vendor/
diff --git a/CHANGELOG b/CHANGELOG
index 59f8f0d..7fd6580 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,32 @@ Release notes for the puppetlabs-puppetdb module.
 
 ------------------------------------------
 
+#### 2.0.0 - 2013/10/04
+
+This major release changes the main dependency for the inifile module from
+the deprecated `cprice404/inifile` to `puppetlabs/inifile` to remove
+deprecation warnings and to move onto the latest and greatest implementation
+of that code.
+
+Its a major release, because it may affect other dependencies since modules
+cannot have overlapping second part dependencies (that is inifile cannot be from
+two different locations).
+
+It also adds the parameter `puppetdb_service_status` to the class `puppetdb` to
+allow users to specify whether the module manages the puppetdb service for you.
+
+The `database_password` parameter is now optional, and initial Arch Linux
+support has been added.
+
+Detailed Changes:
+
+* (GH-73) Switch to puppetlabs/inifile from cprice/inifile (Ken Barber)
+* Make database_password an optional parameter (Nick Lewis)
+* add archlinux support (Niels Abspoel)
+* Added puppetdb service control (Akos Hencz)
+
+------------------------------------------
+
 #### 1.6.0 - 2013/08/07
 
 This minor feature release provides extra parameters for new configuration
diff --git a/Modulefile b/Modulefile
index 70239d2..29f10ae 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-puppetdb'
-version '1.6.0'
+version '2.0.0'
 source 'git://github.com/puppetlabs/puppetlabs-puppetdb.git'
 author 'Puppet Labs'
 description 'PuppetDB resource types'
diff --git a/README.md b/README.md
index 2625332..8641692 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ puppetdb
 1. [Overview - What is the PuppetDB module?](#overview)
 2. [Module Description - What does the module do?](#module-description)
 3. [Setup - The basics of getting started with PuppetDB module](#setup)
+4. [Upgrading - Guide for upgrading from older revisions of this module](#upgrading)
 4. [Usage - The classes and parameters available for configuration](#usage)
 5. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
 6. [Limitations - OS compatibility, etc.](#limitations)
@@ -135,6 +136,18 @@ Hence the failed puppet runs. These failures should be limited to 1 failed run o
 
 You can also manually trigger puppet runs on the nodes in the correct order (Postgres, PuppetDB, puppet master), which will avoid any failed runs.
 
+Upgrading
+---------
+
+###Upgrading from 1.x to version 2.x
+
+A major dependency has been changed, so now when you upgrade to 2.0 the dependency `cprice404/inifile` has been replaced with `puppetlabs/inifile`. This may interfer with other modules as they may depend on the old `cprice404/inifile` instead, so upgrading should be done with caution. Check that your other modules use the newer `puppetlabs/inifile` module as interoperation with the old `cprice404/inifile` module will no longer be supported by this module.
+
+Depending on how you install your modules, changing the dependency may require manual intervention. Double check your modules contains the newer `puppetlabs/inifile` after installing this latest module.
+
+Otherwise, all existing parameters from 1.x should still work correctly.
+
+
 Usage
 ------