diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5038864..e6e00cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@ postfix Cookbook CHANGELOG
 ==========================
 This file is used to list changes made in each version of the postfix cookbook.
 
+v3.6.0 (2014-08-25)
+-------------------
+- restart postfix after updating virtual alias templates #86
+- fixing typo for alias_db location in omnios
+- moving conditional attributes to a recipe so they can be modified
+  via other cookbook attributes
+
 v3.5.0 (2014-08-25)
 -------------------
 Adding virtual_domains functionality
diff --git a/metadata.rb b/metadata.rb
index 51d0ec3..25d1ed5 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ description 'Installs and configures postfix for client or outbound relayhost, o
 maintainer 'Chef Software, Inc.'
 maintainer_email 'cookbooks@getchef.com'
 license 'Apache 2.0'
-version '3.5.0'
+version '3.6.0'
 recipe 'postfix', 'Installs and configures postfix'
 recipe 'postfix::sasl_auth', 'Set up postfix to auth to a server with sasl'
 recipe 'postfix::aliases', 'Manages /etc/aliases'