diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6e2344..5fedc72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.2.0:
+
+* [COOK-880] - add client/server roles for search-based discovery of
+  relayhost
+
 ## v1.0.0:
 
 * [COOK-668] - RHEL/CentOS/Scientific/Amazon platform support
diff --git a/metadata.rb b/metadata.rb
index e459fe8..eb313c3 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -2,10 +2,12 @@ maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures postfix for client or outbound relayhost, or to do SASL auth"
-version           "1.0.1"
+version           "1.2.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"
+recipe            "postfix::client", "Searches for the relayhost based on an attribute"
+recipe            "postfix::server", "Sets the mail_type attribute to master"
 
 %w{ubuntu debian redhat centos amazon scientific}.each do |os|
   supports os
@@ -90,3 +92,13 @@ attribute "postfix/aliases",
   :display_name => "Postfix mail aliases",
   :description => "Hash of mail aliases for /etc/aliases",
   :default => ""
+
+attribute "postfix/relayhost_role",
+  :display_name => "Postfix Relayhost's role",
+  :description => "String containing the role name",
+  :default => "relayhost"
+
+attribute "postfix/multi_environment_relay",
+  :display_name => "Postfix Search for relayhost in any environment",
+  :description => "If true, then the client recipe will search any environment instead of just the node's",
+  :default => ""