diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f5b0aa5..963f4975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@ rsyslog Cookbook CHANGELOG
 ==========================
 This file is used to list changes made in each version of the rsyslog cookbook.
 
+v.2.0.0 (2015-05-18)
+Note: This version includes several breaking changes for Ubuntu users. Be sure to take care when deploying these changes to production systems.
+
+- 49-relp.conf now properly uses the list of servers discovered in the client recipe
+- Fixed a typo that prevented file-input.conf from properly templating
+- Added allow_non_local attribute to allow non-local messages. This defaults to false, which preserves the previous functionality
+- The rsyslog directory permissions are now properly set using the user/group attributes instead of root/root
+- Properly drop permissions on Ubuntu systems to syslog/syslog.  Introduces 2 new attributes to control the user/group: priv_user and priv_group
+- Remove logging to /dev/xconsole in 50-default.conf on Ubuntu systems.  This is generally not something you'd want to do and produces error messages at startup.
+
 v.1.15.0 (2015-02-23)
 ---------------------
 - Change minimum supported Fedora release to 20 to align with the Fedora product lifecycle
@@ -18,7 +28,7 @@ v.1.14.0 (2015-01-30)
 - Fixed bad variable in the 49-relp.conf template that prevented Chef converges from completing.
 - Removed the 'reload' action from the rsyslog service as newer rsyslog releases don't support reload.
 - Updated Chefspecs to remove deprecation warnings and added additional tests.
-- Removed node name from the comment block in the config files. 
+- Removed node name from the comment block in the config files.
 - Added a new file_input LWRP for defining configs.
 - Added support for chef solo search cookbook.
 
diff --git a/metadata.rb b/metadata.rb
index 419b4ef8..6f33e5e5 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license           'Apache 2.0'
 description       'Installs and configures rsyslog'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '1.15.0'
+version           '2.0.0'
 
 recipe            'rsyslog', 'Installs rsyslog'
 recipe            'rsyslog::client', 'Sets up a client to log to a remote rsyslog server'