diff --git a/apache2/metadata.rb b/apache2/metadata.rb
index 9dd667ac8..f3df9c147 100644
--- a/apache2/metadata.rb
+++ b/apache2/metadata.rb
@@ -1,7 +1,7 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures apache2"
+description       "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
 recipe            "apache2", "Main Apache configuration"
diff --git a/apparmor/metadata.rb b/apparmor/metadata.rb
index 1b320b206..ea9923aa3 100644
--- a/apparmor/metadata.rb
+++ b/apparmor/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures apparmor"
-long_description  "Configures#{cookbook.name}"
+description       "Disables apparmor service on Ubuntu"
 version           "0.7"
+supports          "ubuntu"
diff --git a/apt/metadata.rb b/apt/metadata.rb
index 1d25fc005..469496c05 100644
--- a/apt/metadata.rb
+++ b/apt/metadata.rb
@@ -1,8 +1,11 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures apt"
-long_description  "Configures#{cookbook.name}"
+description       "Configures apt and apt services"
 version           "0.7"
-recipe            "apt::cacher"
-recipe            "apt::proxy"
+recipe            "apt::cacher", "Set up an APT cache"
+recipe            "apt::proxy", "Set up an APT proxy"
+
+%w{ ubuntu debian }.each do |os|
+  supports os
+end
diff --git a/apt/recipes/default.rb b/apt/recipes/default.rb
index bc2c5faa9..425fa03e0 100644
--- a/apt/recipes/default.rb
+++ b/apt/recipes/default.rb
@@ -28,4 +28,4 @@
     mode  0644
     action :create
   end
-end
\ No newline at end of file
+end
diff --git a/build-essential/metadata.rb b/build-essential/metadata.rb
index 1c194431d..5e1613e0d 100644
--- a/build-essential/metadata.rb
+++ b/build-essential/metadata.rb
@@ -1,6 +1,9 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures build-essential"
-long_description  "Configures#{cookbook.name}"
+description       "Installs C compiler / build tools"
 version           "0.7"
+
+%w{ centos ubuntu debian }.each do |os|
+  supports os
+end
diff --git a/capistrano/metadata.rb b/capistrano/metadata.rb
index 77dae0bce..4e5862e38 100644
--- a/capistrano/metadata.rb
+++ b/capistrano/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures capistrano"
-long_description  "Configures#{cookbook.name}"
+description       "Installs Capistrano gem and provides a define to set up deployment for an application"
 version           "0.7"
+recipe            "capistrano", "Installs Capistrano gem"
diff --git a/chef/metadata.rb b/chef/metadata.rb
index b6aa14d60..83628a9e1 100644
--- a/chef/metadata.rb
+++ b/chef/metadata.rb
@@ -1,32 +1,87 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures chef"
+description       "Installs and configures chef client and server"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "chef::client"
-recipe            "chef::server"
-
-attribute         "chef",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "chef" ],
-  :default => ""
-
-attribute         "client",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "chef" ],
-  :default => ""
-
-attribute         "indexer",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "chef" ],
-  :default => ""
-
-attribute         "server",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "chef" ],
-  :default => ""
+recipe            "chef::client", "Sets up a client to talk to a chef-server"
+recipe            "chef::server", "Configures a chef-server as a passenger application"
+
+%w{ runit packages couchdb stompserver apache2 }.each do |cb|
+  depends cb
+end
+
+%w{ centos rhel ubuntu debian }.each do |os|
+  supports os
+end
+
+attribute "chef/path",
+  :display_name => "Chef Path",
+  :description => "Filesystem location for Chef files",
+  :default => "/srv/chef"
+
+attribute "chef/run_path",
+  :display_name => "Chef Run Path",
+  :description => "Filesystem location for Chef 'run' files",
+  :default => "/var/run/chef"
+
+attribute "chef/client_version",
+  :display_name => "Chef Client Version",
+  :description => "Set the version of the client gem to install",
+  :default => "0.6.2"
+
+attribute "chef/client_interval",
+  :display_name => "Chef Client Interval ",
+  :description => "Poll chef client process to run on this interval in seconds",
+  :default => "1800"
+
+attribute "chef/client_splay",
+  :display_name => "Chef Client Splay ",
+  :description => "Random number of seconds to add to interval",
+  :default => "20"
+
+attribute "chef/client_log",
+  :display_name => "Chef Client Log",
+  :description => "Location of the chef client log",
+  :default => "/var/log/chef/client.log"
+
+attribute "chef/indexer_log",
+  :display_name => "Chef Indexer Log ",
+  :description => "Location of the chef-indexer log",
+  :default => "/var/log/chef/indexer.log"
+
+attribute "chef/server_version",
+  :display_name => "Chef Server Version",
+  :description => "Set the version of the server and server-slice gems to install",
+  :default => "0.6.2"
+
+attribute "chef/server_log",
+  :display_name => "Chef Server Log",
+  :description => "Location of the Chef server log",
+  :default => "/var/log/chef/server.log"
+
+attribute "chef/server_path",
+  :display_name => "Chef Server Path",
+  :description => "Location of the Chef Server assets",
+  :default => "gems_path/gems/chef-server-chef_server_version"
+
+attribute "chef/server_hostname",
+  :display_name => "Chef Server Hostname",
+  :description => "Hostname for the chef server, for building FQDN",
+  :default => "hostname"
+
+attribute "chef/server_fqdn",
+  :display_name => "Chef Server Fully Qualified Domain Name",
+  :description => "FQDN of the Chef server for Apache vhost and SSL certificate and clients",
+  :default => "hostname.domain"
+
+attribute "chef/server_ssl_req", 
+  :display_name => "Chef Server SSL Request",
+  :description => "Data to pass for creating the SSL certificate",
+  :default => "/C=US/ST=Several/L=Locality/O=Example/OU=Operations/CN=chef_server_fqdn/emailAddress=ops@domain"
+
+attribute "chef/server_token",
+  :display_name => "Chef Server Validation Token",
+  :description => "Value of the validation_token",
+  :default => "randomly generated"
+
diff --git a/couchdb/metadata.rb b/couchdb/metadata.rb
index b72c6d9ba..ba9db46fa 100644
--- a/couchdb/metadata.rb
+++ b/couchdb/metadata.rb
@@ -1,6 +1,16 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures couchdb"
-long_description  "Configures#{cookbook.name}"
+description       "Installs CouchDB package and starts service"
+long_description  <<-EOH
+Installs the CouchDB package if it is available from an package repository on
+the node. If the package repository is not available, CouchDB needs to be 
+installed via some other method, either a backported package, or compiled 
+directly from source.
+EOH
 version           "0.7"
+supports          "ubuntu", ">= 8.10" # for package in APT
+
+%w{ rhel centos fedora }.each do |os|
+  supports os # requires that CouchDB package is available in yum repositories
+end
diff --git a/django/metadata.rb b/django/metadata.rb
index 24f1ac7b5..6b5193a9a 100644
--- a/django/metadata.rb
+++ b/django/metadata.rb
@@ -1,6 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures django"
+description       "Installs DJango"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+
+%w{ apache2 python}.each do |cb|
+  depends cb
+end
diff --git a/djbdns/metadata.rb b/djbdns/metadata.rb
index c8b89c42e..29aaa64e4 100644
--- a/djbdns/metadata.rb
+++ b/djbdns/metadata.rb
@@ -1,16 +1,55 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures djbdns"
-long_description  "Configures#{cookbook.name}"
+description       "Installs djbdns and configures DNS services"
 version           "0.7"
-recipe            "djbdns::axfr"
-recipe            "djbdns::cache"
-recipe            "djbdns::internal_server"
-recipe            "djbdns::server"
-
-attribute         "djbdns",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "djbdns" ],
-  :default => ""
+recipe            "djbdns", "Installs djbdns from package or source and creates users"
+recipe            "djbdns::axfr", "Sets up djbdns AXFR service"
+recipe            "djbdns::cache", "Sets up public dnscache service"
+recipe            "djbdns::internal_server", "Sets up internal TinyDNS"
+recipe            "djbdns::server", "Sets up external TinyDNS"
+
+%w{ build-essential runit }.each do |cb|
+  depends cb
+end
+
+%w{ ubuntu debian centos rhel }.each do |os|
+  supports os
+end
+
+attribute "djbdns/tinydns_ipaddress",
+  :display_name => "DJB DNS TinyDNS IP Address",
+  :description => "Specify the IP address for TinyDNS",
+  :default => "127.0.0.1"
+
+attribute "djbdns/tinydns_internal_ipaddress",
+  :display_name => "DJB DNS TinyDNS Internal IP Address",
+  :description => "Specify the IP address for internal TinyDNS",
+  :default => "127.0.0.1"
+
+attribute "djbdns/axfrdns_ipaddress",
+  :display_name => "DJB DNS AXFR IP Address",
+  :description => "Specify the IP address for AXFR service",
+  :default => "127.0.0.1"
+
+attribute "djbdns/public_dnscache_ipaddress",
+  :display_name => "DJB DNS Public DNS Cache IP Address",
+  :description => "Specify the IP address for the public dnscache",
+  :default => "ipaddress"
+
+attribute "djbdns/public_dnscache_allowed_networks",
+  :display_name => "DJB DNS Public DNS Cache Allowed Networks",
+  :description => "Networks allowed to query the public dnscache",
+  :type => "array",
+  :default => ["ipaddress.split('.')[0,2].join('.')"]
+
+attribute "djbdns/tinydns_internal_resolved_domain",
+  :display_name => "DJB DNS TinyDNS Internal Resolved Domain",
+  :description => "Internal domain TinyDNS is resolver"
+  :default => "domain"
+
+attribute "djbdns/bin_dir",
+  :display_name => "DJB DNS Binaries Directory",
+  :description => "Location of the djbdns binaries",
+  :default => "/usr/local/bin"
+
diff --git a/drbd/metadata.rb b/drbd/metadata.rb
index d3320d94b..15ccf2b6e 100644
--- a/drbd/metadata.rb
+++ b/drbd/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures drbd"
-long_description  "Configures#{cookbook.name}"
+description       "Installs but does not configure drbd"
 version           "0.7"
+depends           "lvm"
diff --git a/ec2/metadata.rb b/ec2/metadata.rb
index 6d24275e5..0ce8a42ec 100644
--- a/ec2/metadata.rb
+++ b/ec2/metadata.rb
@@ -1,18 +1,9 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures ec2"
-long_description  "Configures#{cookbook.name}"
+description       "Manage EC2 metadata as attributes"
 version           "0.7"
 
-attribute         "ec2_metadata",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "ec2" ],
-  :default => ""
-
-attribute         "ec2_recipe_options",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "ec2" ],
-  :default => ""
+attribute "ec2_metadata",
+  :display_name => "EC2 Metadata",
+  :description => "Retrieve EC2 instance metadata",
diff --git a/emacs/metadata.rb b/emacs/metadata.rb
index 1d63d275b..3b2eb5eed 100644
--- a/emacs/metadata.rb
+++ b/emacs/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures emacs"
-long_description  "Configures#{cookbook.name}"
+description       "Installs emacs"
 version           "0.7"
diff --git a/erlang/metadata.rb b/erlang/metadata.rb
index 34f21300f..def475aaf 100644
--- a/erlang/metadata.rb
+++ b/erlang/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures erlang"
-long_description  "Configures#{cookbook.name}"
+description       "Installs erlang"
 version           "0.7"
diff --git a/fail2ban/metadata.rb b/fail2ban/metadata.rb
index a3eee52f3..a4ceb63fa 100644
--- a/fail2ban/metadata.rb
+++ b/fail2ban/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures fail2ban"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures fail2ban"
 version           "0.7"
diff --git a/gems/metadata.rb b/gems/metadata.rb
index bb172bd68..9e16dac99 100644
--- a/gems/metadata.rb
+++ b/gems/metadata.rb
@@ -1,13 +1,30 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures gems"
+description       "Sets up a local gem server repository"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "gems::server"
+recipe            "gems::server", "Sets up a local gem server repository"
+depends           "apache2"
+suggests          "ruby" # :-)
 
-attribute         "server",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "gems" ],
-  :default => ""
+attribute "gem_server",
+  :display_name => "Gem Server",
+  :description => "Hash of Gem Server attributes",
+  :type => "hash"
+
+attribute "gem_server/virtual_host_name",
+  :display_name => "Gem Server Virtual Hostname",
+  :description => "Apache ServerName for the virtual host",
+  :default => "gems.domain"
+  
+attribute "gem_server/virtual_host_alias",
+  :display_name => "Gem Server Virtual Host Aliases",
+  :description => "Array of Apache ServerAlias'es",
+  :type => "array",
+  :default => "gems"
+
+attribute "gem_server/directory",
+  :display_name => "Gem Server Directory",
+  :description => "Filesystem location of where the gems repository is served from",
+  :default => "/srv/gems"
diff --git a/git/metadata.rb b/git/metadata.rb
index efebe305b..77fdc903a 100644
--- a/git/metadata.rb
+++ b/git/metadata.rb
@@ -1,7 +1,11 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures git"
+description       "Installs git and/or sets up a Git server daemon"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "git::server"
+recipe            "git::server", "Sets up a runit_service for git daemon"
+
+%w{ apache2 runit }.each do |cb|
+  depends cb
+end
diff --git a/god/metadata.rb b/god/metadata.rb
index 3eccde8de..652cb8cca 100644
--- a/god/metadata.rb
+++ b/god/metadata.rb
@@ -1,6 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures god"
+description       "Installs and configures god and provides a define for monitoring"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+
+%w{ ruby runit }.each do |cb|
+  depends cb
+end
diff --git a/hadoop/metadata.rb b/hadoop/metadata.rb
index 2b3b5f5a9..acb21bade 100644
--- a/hadoop/metadata.rb
+++ b/hadoop/metadata.rb
@@ -1,12 +1,41 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures hadoop"
+description       "Installs hadoop and sets up basic cluster per Hadoop's quick start docs"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+depends           "java"
 
-attribute         "hadoop",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "hadoop" ],
-  :default => ""
+%w{ redhat centos fedora debian ubuntu }.each do |os|
+  supports os
+end
+
+attribute  "hadoop",
+  :display_name => "Hadoop",
+  :description => "Hash of Hadoop attributes",
+  :type => "hash"
+  
+attribute "hadoop/mirror_url",
+  :display_name => "Hadoop Mirror URL",
+  :description => "The mirror where we download Hadoop",
+  :default => "http://apache.osuosl.org/hadoop/core"
+
+attribute "hadoop/version",
+  :display_name => "Hadoop Version",
+  :description => "Version of Hadoop to download and install",
+  :default => "0.19.1"
+
+attribute "hadoop/uid",
+  :display_name => "Hadoop UID",
+  :description => "Default UID of the hadoop user",
+  :default => "991"
+
+attribute "hadoop/gid",
+  :display_name => "Hadoop GID",
+  :description => "Default group of the hadoop user",
+  :default => "65534" # ie, nobody
+  
+attribute "hadoop/java_home",
+  :display_name => "Hadoop Java Home",
+  :description => "JAVA_HOME environment variable for Hadoop",
+  :default => "/usr/lib/jvm/java-6-sun-JAVA_VERSION"
\ No newline at end of file
diff --git a/haproxy/metadata.rb b/haproxy/metadata.rb
index 782279817..5fb7c3755 100644
--- a/haproxy/metadata.rb
+++ b/haproxy/metadata.rb
@@ -1,6 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures haproxy"
+description       "Installs and configures haproxy"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+
+%w{ debian ubuntu }.each do |os|
+  supports os
+end
diff --git a/heartbeat/metadata.rb b/heartbeat/metadata.rb
index cccdb12cd..e3a869e03 100644
--- a/heartbeat/metadata.rb
+++ b/heartbeat/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures heartbeat"
-long_description  "Configures#{cookbook.name}"
+description       "Installs but does not configure heartbeat"
 version           "0.7"
+suggests          "drbd"
diff --git a/iptables/metadata.rb b/iptables/metadata.rb
index d92532a9c..e2c8be04c 100644
--- a/iptables/metadata.rb
+++ b/iptables/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures iptables"
-long_description  "Configures#{cookbook.name}"
+description       "Sets up iptables to use a script to maintain rules"
 version           "0.7"
diff --git a/java/metadata.rb b/java/metadata.rb
index 6d51a9574..5f5b9f5a4 100644
--- a/java/metadata.rb
+++ b/java/metadata.rb
@@ -1,6 +1,9 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures java"
-long_description  "Configures#{cookbook.name}"
+description       "Installs java"
 version           "0.7"
+
+%w{ debian ubuntu }.each do |os|
+  supports os
+end
diff --git a/java/recipes/default.rb b/java/recipes/default.rb
index 20b216844..f46c9dbf7 100644
--- a/java/recipes/default.rb
+++ b/java/recipes/default.rb
@@ -42,6 +42,3 @@
 end
 
 package "ant"
-
-
-
diff --git a/jira/metadata.rb b/jira/metadata.rb
index 2abe02721..5fffbf827 100644
--- a/jira/metadata.rb
+++ b/jira/metadata.rb
@@ -1,12 +1,61 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures jira"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures jira"
 version           "0.7"
+recommends        "mysql"
+
+%w{ runit java apache2 }.each do |cb|
+  depends cb
+end
+
+attribute "jira",
+  :display_name => "Jira",
+  :description => "Hash of Jira attributes",
+  :type => "hash"
+
+attribute "jira/virtual_host_name",
+  :display_name => "Jira Virtual Hostname",
+  :description => "Apache ServerName for Jira virtual host",
+  :default => "jira.domain"
+
+attribute "jira/virtual_host_alias",
+  :display_name => "Jira Virtual Hostalias",
+  :description => "Apache ServerAlias for Jira virtual host",
+  :default => "jira"
+
+attribute "jira/version",
+  :display_name => "Jira Version",
+  :description => "Version of Jira to download and install",
+  :default => "enterprise-3.13.1",
+
+attribute "jira/install_path",
+  :display_name => "Jira Install Path",
+  :description => "Filesystem location for Jira",
+  :default => "/srv/jira"
+
+attribute "jira/run_user",
+  :display_name => "Jira Run User",
+  :description => "User the Jira instance should run as",
+  :default => "www-data"
+
+attribute "jira/database",
+  :display_name => "Jira Database",
+  :description => "Type of database Jira should use",
+  :default => "mysql"
+
+attribute "jira/database_host",
+  :display_name => "Jira Database Host",
+  :description => "Hostname of the database server",
+  :default => "localhost"
+
+attribute "jira/database_user",
+  :display_name => "Jira Database User",
+  :description => "Name of the database user for Jira",
+  :default => "jira"
+
+attribute "jira/database_password",
+  :display_name => "Jira Database Password",
+  :description => "Password for the Jira Database User",
+  :default => "change_me"
 
-attribute         "jira",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "jira" ],
-  :default => ""
diff --git a/keepalived/metadata.rb b/keepalived/metadata.rb
index 7f6683859..ce47324d0 100644
--- a/keepalived/metadata.rb
+++ b/keepalived/metadata.rb
@@ -1,6 +1,7 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures keepalived"
+description       "Installs and configures keepalived"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+supports          "ubuntu"
diff --git a/logrotate/metadata.rb b/logrotate/metadata.rb
index fa54ae53f..68b2069ea 100644
--- a/logrotate/metadata.rb
+++ b/logrotate/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures logrotate"
-long_description  "Configures#{cookbook.name}"
+description       "Installs logrotate"
 version           "0.7"
diff --git a/lvm/metadata.rb b/lvm/metadata.rb
index 1c939d127..2f470cef9 100644
--- a/lvm/metadata.rb
+++ b/lvm/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures lvm"
-long_description  "Configures#{cookbook.name}"
+description       "Installs lvm2 package"
 version           "0.7"
diff --git a/man/metadata.rb b/man/metadata.rb
index 35619d769..e53b48daf 100644
--- a/man/metadata.rb
+++ b/man/metadata.rb
@@ -1,6 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures man"
-long_description  "Configures#{cookbook.name}"
+description       "Installs man-db"
 version           "0.7"
+
+%w{ debian ubuntu }.each do |os|
+  supports os
+end
+
diff --git a/maradns/metadata.rb b/maradns/metadata.rb
index 665c3735f..d1f2b13cf 100644
--- a/maradns/metadata.rb
+++ b/maradns/metadata.rb
@@ -1,12 +1,15 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures maradns"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures maradns"
 version           "0.7"
 
-attribute         "maradns",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "maradns" ],
+attribute "maradns",
+  :display_name => "MaraDNS",
+  :description => "Hash of MaraDNS attributes",
+  :type => "hash"
+
+attribute "maradns/recursive_acl",
+  :display_name => "MaraDNS Recursive ACL",
+  :description => "Sets the recursive_acl setting in mararc.erb",
   :default => ""
diff --git a/memcached/metadata.rb b/memcached/metadata.rb
index 8e531defd..8e4985d82 100644
--- a/memcached/metadata.rb
+++ b/memcached/metadata.rb
@@ -1,12 +1,22 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures memcached"
+description       "Installs memcached and provides a define to set up an instance of memcache via runit"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+depends           "runit"
 
-attribute         "memcached",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "memcached" ],
-  :default => ""
+attribute "memcached/memory",
+  :display_name => "Memcached Memory",
+  :description => "Memory allocated for memcached instance",
+  :default => "64"
+
+attribute "memcached/port",
+  :display_name => "Memcached Port",
+  :description => "Port to use for memcached instance",
+  :default => "11211"
+
+attribute "memcached/user",
+  :display_name => "Memcached User",
+  :description => "User to run memcached instance as",
+  :default => "nobody"
diff --git a/mercurial/metadata.rb b/mercurial/metadata.rb
index 3592a4511..d02848a49 100644
--- a/mercurial/metadata.rb
+++ b/mercurial/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures mercurial"
-long_description  "Configures#{cookbook.name}"
+description       "Installs mercurial"
 version           "0.7"
diff --git a/munin/metadata.rb b/munin/metadata.rb
index 1194eda02..59d584126 100644
--- a/munin/metadata.rb
+++ b/munin/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures munin"
-long_description  "Configures#{cookbook.name}"
+description       "Instsalls and configures munin"
 version           "0.7"
+
diff --git a/mysql/metadata.rb b/mysql/metadata.rb
index 171e2d7cf..ee9ab3f43 100644
--- a/mysql/metadata.rb
+++ b/mysql/metadata.rb
@@ -1,20 +1,66 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures mysql"
+description       "Installs and configures mysql for client or server"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "mysql::client"
-recipe            "mysql::server"
-
-attribute         "mysql_ec2",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "mysql" ],
-  :default => ""
-
-attribute         "server",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "mysql" ],
-  :default => ""
+recipe            "mysql::client", "Installs packages required for mysql clients using run_action magic"
+recipe            "mysql::server", "Installs packages required for mysql servers w/o manual intervention"
+
+attribute "mysql/server_root_password",
+  :display_name => "MySQL Server Root Password",
+  :description => "Randomly generated password for the mysqld root user",
+  :default => "randomly generated"
+
+attribute "mysql/bind_address",
+  :display_name => "MySQL Bind Address",
+  :description => "Address that mysqld should listen on",
+  :default => "ipaddress"
+
+attribute "mysql/datadir",
+  :display_name => "MySQL Data Directory",
+  :description => "Location of mysql databases",
+  :default => "/var/lib/mysql"
+
+attribute "mysql/ec2_path",
+  :display_name => "MySQL EC2 Path",
+  :description => "Location of mysql directory on EC2 instance EBS volumes",
+  :default => "/mnt/mysql"
+
+attribute "mysql/tunable",
+  :display_name => "MySQL Tunables",
+  :description => "Hash of MySQL tunable attributes",
+  :type => "hash"
+
+attribute "mysql/tunable/key_buffer",
+  :display_name => "MySQL Tuntable Key Buffer",
+  :default => "250M"
+
+attribute "mysql/tunable/max_connections",
+  :display_name => "MySQL Tunable Max Connections",
+  :default => "800"
+
+attribute "mysql/tunable/wait_timeout",
+  :display_name => "MySQL Tunable Wait Timeout",
+  :default => "180"
+
+attribute "mysql/tunable/net_read_timeout",
+  :display_name => "MySQL Tunable Net Read Timeout",
+  :default => "30"
+
+attribute "mysql/tunable/net_write_timeout",
+  :display_name => "MySQL Tunable Net Write Timeout",
+  :default => "30"
+
+attribute "mysql/tunable/back_log",
+  :display_name => "MySQL Tunable Back Log",
+  :default => "128"
+
+attribute "mysql/tunable/table_cache",
+  :display_name => "MySQL Tunable Table Cache",
+  :default => "128"
+
+attribute "mysql/tunable/max_heap_table_size",
+  :display_name => "MySQL Tunable Max Heap Table Size",
+  :default => "32M"
+
diff --git a/nginx/metadata.rb b/nginx/metadata.rb
index 7a8510e2b..c565ba8b6 100644
--- a/nginx/metadata.rb
+++ b/nginx/metadata.rb
@@ -1,18 +1,79 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures nginx"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures nginx"
 version           "0.7"
 
-attribute         "nginx_locations",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "nginx" ],
-  :default => ""
-
-attribute         "nginx_settings",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "nginx" ],
-  :default => ""
+%w{ ubuntu debian }.each do |os|
+  supports os
+end
+
+attribute "nginx/dir",
+  :display_name => "Nginx Directory",
+  :description => "Location of nginx configuration files",
+  :default => "/etc/nginx"
+
+attribute "nginx/log_dir",
+  :display_name => "Nginx Log Directory",
+  :description => "Location for nginx logs",
+  :default => "/var/log/nginx"
+
+attribute "nginx/user",
+  :display_name => "Nginx User",
+  :description => "User nginx will run as",
+  :default => "www-data"
+
+attribute "nginx/binary",
+  :display_name => "Nginx Binary",
+  :description => "Location of the nginx server binary",
+  :default => "/usr/sbin/nginx"
+
+attribute "nginx/gzip",
+  :display_name => "Nginx Gzip",
+  :description => "Whether gzip is enabled",
+  :default => "on"
+
+attribute "nginx/gzip_http_version",
+  :display_name => "Nginx Gzip HTTP Version",
+  :description => "Version of HTTP Gzip",
+  :default => "1.0"
+
+attribute "nginx/gzip_comp_level",
+  :display_name => "Nginx Gzip Compression Level",
+  :description => "Amount of compression to use",
+  :default => "2"
+
+attribute "nginx/gzip_proxied",
+  :display_name => "Nginx Gzip Proxied",
+  :description => "Whether gzip is proxied",
+  :default => "any"
+
+attribute "nginx/gzip_types",
+  :display_name => "Nginx Gzip Types",
+  :description => "Supported MIME-types for gzip",
+  :type => "array"
+  :default => [ "text/plain", "text/html", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript" ]
+
+attribute "nginx/keepalive",
+  :display_name => "Nginx Keepalive",
+  :description => "Whether to enable keepalive",
+  :default => "on"
+
+attribute "nginx/keepalive_timeout",
+  :display_name => "Nginx Keepalive Timeout",
+  :default => "65"
+
+attribute "nginx/worker_processes",
+  :display_name => "Nginx Worker Processes",
+  :description => "Number of worker processes",
+  :default => "1"
+
+attribute "nginx/worker_connections",
+  :display_name => "Nginx Worker Connections",
+  :description => "Number of connections per worker",
+  :default => "1024"
+
+attribute "nginx/server_names_hash_bucket_size",
+  :display_name => "Nginx Server Names Hash Bucket Size",
+  :default => "64"
+
diff --git a/nscd/metadata.rb b/nscd/metadata.rb
index b14172345..9ffef31ab 100644
--- a/nscd/metadata.rb
+++ b/nscd/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures nscd"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures nscd"
 version           "0.7"
+suggests          "openldap"
diff --git a/ntp/metadata.rb b/ntp/metadata.rb
index 38a14e837..14061882c 100644
--- a/ntp/metadata.rb
+++ b/ntp/metadata.rb
@@ -1,12 +1,31 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures ntp"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures ntp as a client or server"
 version           "0.7"
 
-attribute         "ntp",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "ntp" ],
-  :default => ""
+%w{ ubuntu debian redhat centos fedora }.each do |os|
+  supports os
+end
+
+attribute "ntp",
+  :display_name => "NTP",
+  :description => "Hash of NTP attributes",
+  :type => "hash"
+
+attribute "ntp/service",
+  :display_name => "NTP Service",
+  :description => "Name of the NTP service",
+  :default => "ntp"
+
+attribute "ntp/is_server",
+  :display_name => "NTP Is Server?",
+  :description => "Set to true if this is an NTP server",
+  :default => "false"
+
+attribute "ntp/servers",
+  :display_name => "NTP Servers",
+  :description => "Array of servers we should talk to",
+  :type => "array"
+  :default => ["0.us.pool.ntp.org", "1.us.pool.ntp.org"]
+
diff --git a/openldap/metadata.rb b/openldap/metadata.rb
index 46583f268..e9cfe06cc 100644
--- a/openldap/metadata.rb
+++ b/openldap/metadata.rb
@@ -1,15 +1,98 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures openldap"
+description       "Configures a server to be an OpenLDAP master, replication slave or client for auth"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "openldap::auth"
+recipe            "openldap::auth",
 recipe            "openldap::client"
 recipe            "openldap::server"
 
-attribute         "openldap",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "openldap" ],
-  :default => ""
+%w{ ubuntu debian }.each do |os|
+  supports os
+end
+
+%w{ openssh nscd }.each do |cb|
+  depends cb
+end
+
+attribute "openldap/basedn",
+  :display_name => "OpenLDAP BaseDN",
+  :description => "BaseDN for the LDAP directory",
+  :default => "dc=domain,dc=com"
+
+attribute "openldap/server",
+  :display_name => "OpenLDAP Server",
+  :description => "LDAP Server, used for URIs",
+  :default => "ldap.domain"
+
+attribute "openldap/rootpw",
+  :display_name => "OpenLDAP Root Password",
+  :description => "Password for 'admin' root user, should be a SHA hash that OpenLDAP supports",
+  :default => "nil"
+
+attribute "openldap/dir",
+  :display_name => "OpenLDAP Dir",
+  :description => "Main configuration directory for OpenLDAP",
+  :default => "/etc/ldap"
+
+attribute "openldap/run_dir",
+  :display_name => "OpenLDAP Run Directory",
+  :description => "Run directory for LDAP server processes",
+  :default => "/var/run/slapd"
+
+attribute "openldap/module_dir",
+  :display_name => "OpenLDAP Module Directory",
+  :description => "Location for OpenLDAP add-on modules",
+  :default => "/usr/lib/ldap"
+
+attribute "openldap/ssl_dir",
+  :display_name => "OpenLDAP SSL Directory",
+  :description => "Location for LDAP SSL certificates",
+  :default => "openldap_dir/ssl"
+
+attribute "openldap/cafile",
+  :display_name => "OpenLDAP CA File",
+  :description => "Location for CA certificate",
+  :default => "openldap_dir_ssl/ca.crt"
+
+attribute "openldap/slapd_type",
+  :display_name => "OpenLDAP Slapd Type",
+  :description => "Whether the server is a master or slave",
+  :default => "nil"
+
+attribute "openldap/slapd_master",
+  :display_name => "OpenLDP Slapd Master",
+  :description => "Search nodes for attribute slapd_type master, for slaves",
+  :default => "nil"
+
+attribute "openldap/slapd_replpw",
+  :display_name => "OpenLDAP Slapd Replication Password",
+  :description => "Password for slaves to replicate from master",
+  :default => "nil"
+
+attribute "openldap/slapd_rid",
+  :display_name => "OpenLDAP Slapd Replication ID",
+  :description => "Slave's ID, must be unique",
+  :default => "102"
+
+attribute "openldap/auth_type",
+  :display_name => "OpenLDAP Auth Type",
+  :description => "Used in Apache configs, AuthBasicProvider",
+  :default => "openldap"
+
+attribute "openldap/auth_binddn",
+  :display_name => "OpenLDAP Auth BindDN",
+  :description => "Used in auth_url and Apache configs, AuthBindDN",
+  :default => "ou=people,openldap_basedn"
+
+attribute "openldap/auth_bindpw",
+  :display_name => "OpenLDAP Auth Bind Password",
+  :description => "Used in Apache configs, AuthBindPassword",
+  :default => "nil"
+
+attribute "openldap/auth_url",
+  :display_name => "OpenLDAP Auth URL",
+  :description => "Used in Apache configs, AuthLDAPURL",
+  :default => "ldap://openldap_server/openldap_auth_binddn?uid?sub?(objectClass=*)"
+
diff --git a/openssh/metadata.rb b/openssh/metadata.rb
index 4961fb5be..bdad8ad08 100644
--- a/openssh/metadata.rb
+++ b/openssh/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures openssh"
-long_description  "Configures#{cookbook.name}"
+description       "Installs openssh"
 version           "0.7"
+
diff --git a/openvpn/metadata.rb b/openvpn/metadata.rb
index 5674b5531..a0cb97425 100644
--- a/openvpn/metadata.rb
+++ b/openvpn/metadata.rb
@@ -1,12 +1,32 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures openvpn"
+description       "Installs and configures openvpn"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
 
-attribute         "openvpn",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "openvpn" ],
-  :default => ""
+attribute "openvpn/local",
+  :display_name => "OpenVPN Local",
+  :description => "Local interface (ip) to listen on",
+  :default => "ipaddress"
+
+attribute "openvpn/proto",
+  :display_name => "OpenVPN Protocol",
+  :description => "UDP or TCP",
+  :default => "udp"
+
+attribute "openvpn/type",
+  :display_name => "OpenVPN Type",
+  :description => "Server or server-bridge",
+  :default => "server"
+
+attribute "openvpn/subnet",
+  :display_name => "OpenVPN Subnet",
+  :description => "Subnet to hand out to clients",
+  :default => "10.8.0.0"
+
+attribute "openvpn/netmask",
+  :display_name => "OpenVPN Netmask",
+  :description => "Netmask for clients",
+  :default => "255.255.0.0"
+
diff --git a/packages/metadata.rb b/packages/metadata.rb
index 510a041b6..2aa40437b 100644
--- a/packages/metadata.rb
+++ b/packages/metadata.rb
@@ -1,12 +1,16 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures packages"
-long_description  "Configures#{cookbook.name}"
+description       "Helper library to determine whether distribution-only packages are installed"
 version           "0.7"
 
-attribute         "packages",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "packages" ],
-  :default => ""
+attribute "packages",
+  :display_name => "Packages",
+  :description => "Hash of Packages attributes",
+  :type => "hash"
+
+attribute "packages/dist_only",
+  :display_name => "Packages Distribution Only?",
+  :description => "Set to only use distribution-provided packages",
+  :default => "false"
+
diff --git a/passenger/metadata.rb b/passenger/metadata.rb
index a25adc674..45b596bc5 100644
--- a/passenger/metadata.rb
+++ b/passenger/metadata.rb
@@ -1,12 +1,40 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures passenger"
+description       "Installs passenger for Apache2"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
 
-attribute         "passenger",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "passenger" ],
-  :default => ""
+%w{ packages ruby apache2 rails }.each do |cb|
+  depends cb
+end
+
+%w{ redhat centos ubuntu debian }.each do |os|
+  supports os
+end
+
+attribute "gems_path",
+  :display_name => "Gems Path",
+  :description => "Get the gem env gemdir",
+  :default => "gem env gemdir"
+
+attribute "ruby_path",
+  :display_name => "Ruby Path",
+  :description => "Path to 'ruby' binary",
+  :default => "which ruby"
+
+attribute "passenger/version",
+  :display_name => "Passenger Version",
+  :description => "Version of Passenger to install",
+  :default => "2.2.2"
+
+attribute "passenger/root_path",
+  :display_name => "Passenger Root Path",
+  :description => "Location of passenger installed gem",
+  :default => "gems_path/gems/passenger-passenger_version"
+
+attribute "passenger/module_path",
+  :display_name => "Passenger Module Path",
+  :description => "Location of the compiled Apache module",
+  :default => "passenger_root_path/ext/apache2/mod_passenger.so"
+
diff --git a/perl/metadata.rb b/perl/metadata.rb
index 600a57ef6..a4ad086af 100644
--- a/perl/metadata.rb
+++ b/perl/metadata.rb
@@ -1,6 +1,11 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures perl"
+description       "Installs perl and provides a define for maintaining CPAN modules"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+
+%w{ ubuntu debian centos redhat }.each do |os|
+  supports os
+end
+
diff --git a/php/metadata.rb b/php/metadata.rb
index 4da8befa6..a8d1c3c5a 100644
--- a/php/metadata.rb
+++ b/php/metadata.rb
@@ -1,20 +1,21 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures php"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and maintains php and php modules"
 version           "0.7"
-recipe            "php::module_apc"
-recipe            "php::module_curl"
-recipe            "php::module_fileinfo"
-recipe            "php::module_fpdf"
-recipe            "php::module_gd"
-recipe            "php::module_ldap"
-recipe            "php::module_memcache"
-recipe            "php::module_mysql"
-recipe            "php::module_pgsql"
-recipe            "php::module_sqlite3"
-recipe            "php::pear"
-recipe            "php::php4"
-recipe            "php::php5-cgi"
-recipe            "php::php5"
+depends           "apache2"
+recipe            "php::module_apc", "Install the php5-apc package"
+recipe            "php::module_curl", "Install the php5-curl package"
+recipe            "php::module_fileinfo", "Install the php5-fileinfo package"
+recipe            "php::module_fpdf", "Install the php-fpdf package"
+recipe            "php::module_gd", "Install the php5-gd package"
+recipe            "php::module_ldap", "Install the php5-ldap package"
+recipe            "php::module_memcache", "Install the php5-memcache package"
+recipe            "php::module_mysql", "Install the php5-mysql package"
+recipe            "php::module_pgsql", "Install the php5-pgsql packag"
+recipe            "php::module_sqlite3", "Install the php5-sqlite3 package"
+recipe            "php::pear", "Install the php-pear package"
+recipe            "php::php4", "Install packages for PHP version 4"
+recipe            "php::php5-cgi", "Install the php5-cgi package"
+recipe            "php::php5", "Install php5 packages and php.ini config file"
+
diff --git a/postfix/metadata.rb b/postfix/metadata.rb
index b5e056136..a9f3867a5 100644
--- a/postfix/metadata.rb
+++ b/postfix/metadata.rb
@@ -1,13 +1,77 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures postfix"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures postfix for client or outbound relayhost, or to do SASL auth"
 version           "0.7"
-recipe            "postfix::sasl_auth"
+recipe            "postfix::sasl_auth", "Set up postfix to auth to a server with sasl"
 
-attribute         "postfix",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "postfix" ],
+attribute "postfix",
+  :display_name => "Postfix",
+  :description => "Hash of Postfix attributes",
+  :type => "hash"
+
+attribute "postfix/mail_type",
+  :display_name => "Postfix Mail Type",
+  :description => "Is this node a client or server?",
+  :default => "client"
+
+attribute "postfix/myhostname",
+  :display_name => "Postfix Myhostname",
+  :description => "Sets the myhostname value in main.cf",
+  :default => "fqdn"
+
+attribute "postfix/mydomain",
+  :display_name => "Postfix Mydomain",
+  :description => "Sets the mydomain value in main.cf",
+  :default => "domain"
+
+attribute "postfix/myorigin",
+  :display_name => "Postfix Myorigin",
+  :description => "Sets the myorigin value in main.cf",
+  :default => "$myhostname"
+
+attribute "postfix/relayhost",
+  :display_name => "Postfix Relayhost",
+  :description => "Sets the relayhost value in main.cf",
+  :default => ""
+
+attribute "postfix/mail_relay_networks",
+  :display_name => "Postfix Mail Relay Networks",
+  :description => "Sets the mynetworks value in main.cf",
+  :default => "127.0.0.0/8"
+
+attribute "postfix/smtp_sasl_auth_enable",
+  :display_name => "Postfix SMTP SASL Auth Enable",
+  :description => "Enable SMTP SASL Authentication",
+  :default => "no"
+
+attribute "postfix/smtp_sasl_password_maps",
+  :display_name => "Postfix SMTP SASL Password Maps",
+  :description => "hashmap of SASL passwords",
+  :default => "hash:/etc/postfix/sasl_passwd"
+
+attribute "postfix/smtp_sasl_security_options",
+  :display_name => "Postfix SMTP SASL Security Options",
+  :description => "Sets the value of smtp_sasl_security_options in main.cf",
+  :default => "noanonymous"
+
+attribute "postfix/smtp_tls_cafile",
+  :display_name => "Postfix SMTP TLS CA File",
+  :description => "CA certificate file for SMTP over TLS",
+  :default => "/etc/postfix/cacert.pem"
+
+attribute "postfix/smtp_use_tls",
+  :display_name => "Postfix SMTP Use TLS?",
+  :description => "Whether SMTP SASL Auth should use TLS encryption",
+  :default => "yes"
+
+attribute "postfix/smtp_sasl_user_name",
+  :display_name => "Postfix SMTP SASL Username",
+  :description => "User to auth SMTP via SASL",
+  :default => ""
+
+attribute "postfix/smtp_sasl_passwd",
+  :display_name => "Postfix SMTP SASL Password",
+  :description => "Password for smtp_sasl_user_name",
   :default => ""
+
diff --git a/postgresql/metadata.rb b/postgresql/metadata.rb
index 127d5fb18..634b8ac1d 100644
--- a/postgresql/metadata.rb
+++ b/postgresql/metadata.rb
@@ -1,14 +1,18 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures postgresql"
+description       "Installs and configures postgresql for clients or servers"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "postgresql::client"
-recipe            "postgresql::server"
+recipe            "postgresql::client", "Installs postgresql client package(s)"
+recipe            "postgresql::server", "Installs postgresql server packages, templates"
+
+%w{rhel centos ubuntu}.each do |os|
+  supports os
+end
+
+attribute "postgresql/dir",
+  :display_name => "PostgreSQL Directory",
+  :description => "Location of the PostgreSQL databases",
+  :default => "/etc/postgresql/8.3/main"
 
-attribute         "postgresql",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "postgresql" ],
-  :default => ""
diff --git a/python/metadata.rb b/python/metadata.rb
index a8d430b0c..b07b3b650 100644
--- a/python/metadata.rb
+++ b/python/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures python"
-long_description  "Configures#{cookbook.name}"
+description       "Installs python packages"
 version           "0.7"
+
diff --git a/quick_start/attributes/quick_start.rb b/quick_start/attributes/quick_start.rb
index 978e2d9e6..1ce328956 100644
--- a/quick_start/attributes/quick_start.rb
+++ b/quick_start/attributes/quick_start.rb
@@ -1 +1 @@
-deep_though "If a tree falls in the forest..."
+deep_thought "If a tree falls in the forest..."
diff --git a/quick_start/metadata.rb b/quick_start/metadata.rb
index f4acf84dd..318dac25f 100644
--- a/quick_start/metadata.rb
+++ b/quick_start/metadata.rb
@@ -1,12 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures quick_start"
-long_description  "Configures#{cookbook.name}"
+description       "Example cookbook for quick_start wiki document"
 version           "0.7"
 
-attribute         "quick_start",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "quick_start" ],
-  :default => ""
+attribute "quick_start/deep_thought",
+  :display_name => "Quick Start Deep Thought",
+  :description => "A deep thought",
+  :default => "If a tree falls in the forest..."
diff --git a/radiant/metadata.rb b/radiant/metadata.rb
index 9d45e5bd2..c7df4fc21 100644
--- a/radiant/metadata.rb
+++ b/radiant/metadata.rb
@@ -1,12 +1,40 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures radiant"
+description       "Installs radiant from Git repository"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
 
-attribute         "radiant",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "radiant" ],
-  :default => ""
+%w{ git sqlite rails apache2 mysql passenger apache2 }.each do |cb|
+  depends cb
+end
+
+attribute "radiant/branch",
+  :display_name => "Radiant Branch",
+  :description => "Branch from Git to use",
+  :default => "HEAD"
+
+attribute "radiant/migrate",
+  :display_name => "Radiant Migrate",
+  :description => "Whether to do a migration",
+  :default => "false"
+
+attribute "radiant/migrate_command",
+  :display_name => "Radiant Migrate Command",
+  :description => "Command to perform migration",
+  :default => "rake db:migrate"
+
+attribute "radiant/environment",
+  :display_name => "Radiant Environment",
+  :description => "Rails environment to use",
+  :default => "production"
+
+attribute "radiant/revision",
+  :display_name => "Radiant Revision",
+  :description => "Revision to use from Git",
+  :default => "HEAD"
+
+attribute "radiant/action",
+  :display_name => "Radiant Action",
+  :description => "Whether to deploy the application or not",
+  :default => "nothing"
diff --git a/rails/metadata.rb b/rails/metadata.rb
index 75c35e504..5aeae70c3 100644
--- a/rails/metadata.rb
+++ b/rails/metadata.rb
@@ -1,12 +1,31 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures rails"
+description       "Installs rails and provides a sample template for use with passenger"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
 
-attribute         "rails",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "rails" ],
-  :default => ""
+%w{ ruby apache2 passenger }.each do |cb|
+  depends cb
+end
+
+attribute "rails",
+  :display_name => "Rails",
+  :description => "Hash of Rails attributes"
+  :type => "hash"
+
+attribute "rails/version",
+  :display_name => "Rails Version",
+  :description => "Specify the version of Rails to install",
+  :default => "false"
+
+attribute "rails/environment",
+  :display_name => "Rails Environment",
+  :description => "Specify the environment to use for Rails",
+  :default => "production"
+
+attribute "rails/max_pool_size",
+  :display_name => "Rails Max Pool Size",
+  :description => "Specify the MaxPoolSize in the Apache vhost",
+  :default => "4"
+
diff --git a/redmine/metadata.rb b/redmine/metadata.rb
index 3a027e5b7..ac4abd36c 100644
--- a/redmine/metadata.rb
+++ b/redmine/metadata.rb
@@ -1,12 +1,9 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures redmine"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures redmine as a Rails app in passenger"
 version           "0.7"
 
-attribute         "redmine_settings",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "redmine" ],
-  :default => ""
+%w{ apache2 rails passenger mysql sqlite }.each do |cb|
+  depends cb
+end
diff --git a/resolver/metadata.rb b/resolver/metadata.rb
index d9addacf0..61f28ee31 100644
--- a/resolver/metadata.rb
+++ b/resolver/metadata.rb
@@ -1,12 +1,22 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures resolver"
-long_description  "Configures#{cookbook.name}"
+description       "Configures /etc/resolv.conf"
 version           "0.7"
 
-attribute         "resolver",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "resolver" ],
-  :default => ""
+attribute "resolver",
+  :display_name => "Resolver",
+  :description => "Hash of Resolver attributes",
+  :type => "hash"
+
+attribute "resolver/search",
+  :display_name => "Resolver Search",
+  :description => "Default domain to search",
+  :default => "domain"
+
+attribute "resolver/nameservers",
+  :display_name => "Resolver Nameservers",
+  :description => "Default nameservers",
+  :type => "array",
+  :default => [""]
+
diff --git a/rsync/metadata.rb b/rsync/metadata.rb
index 8a4b2271b..a7d3fe36b 100644
--- a/rsync/metadata.rb
+++ b/rsync/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures rsync"
-long_description  "Configures#{cookbook.name}"
+description       "Installs rsync"
 version           "0.7"
+
diff --git a/rsyslog/metadata.rb b/rsyslog/metadata.rb
index acb5c9e79..cf99ee423 100644
--- a/rsyslog/metadata.rb
+++ b/rsyslog/metadata.rb
@@ -1,14 +1,29 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures rsyslog"
+description       "Installs and configures rsyslog"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
-recipe            "rsyslog::client"
-recipe            "rsyslog::server"
-
-attribute         "rsyslog",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "rsyslog" ],
-  :default => ""
+recipe            "rsyslog::client", "Sets up a client to log to a remote rsyslog server"
+recipe            "rsyslog::server", "Sets up an rsyslog server"
+
+attribute "rsyslog",
+  :display_name => "Rsyslog",
+  :description => "Hash of Rsyslog attributes",
+  :type => "hash"
+
+attribute "rsyslog/log_dir",
+  :display_name => "Rsyslog Log Directory",
+  :description => "Filesystem location of logs from clients",
+  :default => "/srv/rsyslog"
+
+attribute "rsyslog/server",
+  :display_name => "Rsyslog Server?",
+  :description => "Is this node an rsyslog server?",
+  :default => "false"
+
+attribute "rsyslog/protocol",
+  :display_name => "Rsyslog Protocol",
+  :description => "Set which network protocol to use for rsyslog",
+  :default => "tcp"
+
diff --git a/ruby/metadata.rb b/ruby/metadata.rb
index 0357c404a..ccf9269f5 100644
--- a/ruby/metadata.rb
+++ b/ruby/metadata.rb
@@ -1,6 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures ruby"
-long_description  "Configures#{cookbook.name}"
+description       "Installs ruby packages"
 version           "0.7"
+
+%w{ centos redhat fedora ubuntu debian }.each do |os|
+  supports os
+end
+
diff --git a/runit/metadata.rb b/runit/metadata.rb
index a727f5ae5..f21c1ba37 100644
--- a/runit/metadata.rb
+++ b/runit/metadata.rb
@@ -1,12 +1,30 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures runit"
-long_description  "Configures#{cookbook.name}"
+description       "Installs runit and provides runit_service definition"
 version           "0.7"
 
-attribute         "sv_bin",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "runit" ],
-  :default => ""
+%w{ ubuntu debian }.each do |os|
+  supports os
+end
+
+attribute "runit",
+  :display_name => "Runit",
+  :description => "Hash of runit attributes",
+  :type => "hash"
+
+attribute "runit/sv_bin",
+  :display_name => "Runit sv bin",
+  :description => "Location of the sv binary",
+  :default => "/usr/bin/sv"
+
+attribute "runit/service_dir",
+  :display_name => "Runit service directory",
+  :description => "Symlinks to services managed under runit",
+  :default => "/etc/service"
+
+attribute "runit/sv_dir",
+  :display_name => "Runit sv directory",
+  :description => "Location of services managed by runit",
+  :default => "/etc/sv"
+
diff --git a/runit/recipes/default.rb b/runit/recipes/default.rb
index 828d10af8..359b8a2c1 100644
--- a/runit/recipes/default.rb
+++ b/runit/recipes/default.rb
@@ -46,5 +46,3 @@
     end
   end
 end
-
-
diff --git a/screen/metadata.rb b/screen/metadata.rb
index aa40df64b..72ed85bf2 100644
--- a/screen/metadata.rb
+++ b/screen/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures screen"
-long_description  "Configures#{cookbook.name}"
+description       "Installs screen"
 version           "0.7"
diff --git a/solr/metadata.rb b/solr/metadata.rb
index 415541859..2ffd70086 100644
--- a/solr/metadata.rb
+++ b/solr/metadata.rb
@@ -1,12 +1,36 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures solr"
+description       "Sets up environment for solr instances"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "0.7"
+suggests          "ruby"
+
+%w{ java capistrano runit }.each do |cb|
+  depends cb
+end
+
+%w{ debian ubuntu }.each do |os|
+  supports os
+end
+
+attribute "solr/user",
+  :display_name => "Solr User",
+  :description => "Username for solr instance",
+  :default => "solr"
+
+attribute "solr/uid",
+  :display_name => "Solr UID",
+  :description => "UID for solr instance",
+  :default => "551"
+
+attribute "solr/group",
+  :display_name => "Solr Group",
+  :description => "Group for solr instance",
+  :default => "solr"
+
+attribute "solr/gid",
+  :display_name => "Solr GID",
+  :description => "GID for solr instance",
+  :default => "551"
 
-attribute         "solr",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "solr" ],
-  :default => ""
diff --git a/sqlite/metadata.rb b/sqlite/metadata.rb
index 895bbf79a..4e1422f49 100644
--- a/sqlite/metadata.rb
+++ b/sqlite/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures sqlite"
-long_description  "Configures#{cookbook.name}"
+description       "Installs sqlite"
 version           "0.7"
diff --git a/stompserver/metadata.rb b/stompserver/metadata.rb
index 1660d65d0..632b8f35e 100644
--- a/stompserver/metadata.rb
+++ b/stompserver/metadata.rb
@@ -1,6 +1,10 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures stompserver"
-long_description  "Configures#{cookbook.name}"
+description       "Installs stompserver and sets up a runit_service"
 version           "0.7"
+
+%w{ packages runit }.each do |cb|
+  depends cb
+end
+
diff --git a/subversion/metadata.rb b/subversion/metadata.rb
index a58a3ffe2..2a655f3b6 100644
--- a/subversion/metadata.rb
+++ b/subversion/metadata.rb
@@ -1,6 +1,6 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures subversion"
-long_description  "Configures#{cookbook.name}"
+description       "Installs subversion"
 version           "0.7"
+
diff --git a/sudo/metadata.rb b/sudo/metadata.rb
index 8d260cd3e..e0594fab2 100644
--- a/sudo/metadata.rb
+++ b/sudo/metadata.rb
@@ -1,12 +1,28 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures sudo"
-long_description  "Configures#{cookbook.name}"
+description       "Installs and configures sudo"
 version           "0.7"
 
-attribute         "sudoers",
-  :display_name => "",
-  :description => "",
-  :recipes => [ "sudo" ],
+attribute "authorization",
+  :display_name => "Authorization",
+  :description => "Hash of Authorization attributes",
+  :type => "hash"
+
+attribute "authorization/sudoers",
+  :display_name => "Authorization Sudoers",
+  :description => "Hash of Authorization/Sudoers attributes",
+  :type => "hash"
+
+attribute "authorization/sudoers/users",
+  :display_name => "Sudo Users",
+  :description => "Users who are allowed sudo ALL",
+  :type => "array"
   :default => ""
+
+attribute "authorization/sudoers/groups",
+  :display_name => "Sudo Groups",
+  :description => "Groups who are allowed sudo ALL",
+  :type => "array"
+  :default => ""
+
diff --git a/teamspeak/metadata.rb b/teamspeak/metadata.rb
index c161a0e0c..00cd48e6c 100644
--- a/teamspeak/metadata.rb
+++ b/teamspeak/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures teamspeak"
-long_description  "Configures#{cookbook.name}"
+description       "Installs teamspeak and enables service"
 version           "0.7"
diff --git a/teamspeak/recipes/default.rb b/teamspeak/recipes/default.rb
index 0a1a76eca..574567f03 100644
--- a/teamspeak/recipes/default.rb
+++ b/teamspeak/recipes/default.rb
@@ -19,4 +19,4 @@
 package "teamspeak-server"
 service "teamspeak-server" do
   action :enable
-end
\ No newline at end of file
+end
diff --git a/ubuntu/metadata.rb b/ubuntu/metadata.rb
index a5909d24b..4c19c9ea2 100644
--- a/ubuntu/metadata.rb
+++ b/ubuntu/metadata.rb
@@ -1,6 +1,7 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures ubuntu"
-long_description  "Configures#{cookbook.name}"
+description       "Sets up sources for ubuntu"
 version           "0.7"
+depends           "apt"
+supports          "ubuntu"
diff --git a/zsh/metadata.rb b/zsh/metadata.rb
index b0cc33050..35b0c2041 100644
--- a/zsh/metadata.rb
+++ b/zsh/metadata.rb
@@ -1,6 +1,5 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures zsh"
-long_description  "Configures#{cookbook.name}"
+description       "Installs zsh"
 version           "0.7"