diff --git a/agent_version/attributes/customize.rb b/agent_version/attributes/customize.rb
new file mode 100644
index 0000000000..a61868d70a
--- /dev/null
+++ b/agent_version/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the agent_version cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "agent_version/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/agent_version/attributes/default.rb b/agent_version/attributes/default.rb
index 6daec6efc1..fe2d24fd17 100644
--- a/agent_version/attributes/default.rb
+++ b/agent_version/attributes/default.rb
@@ -1 +1,18 @@
+###
+# Do not use this file to override the agent_version cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "agent_version/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'agent_version/attributes/apache.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_initial_setup::default'
+include_attribute 'agent_version::customize'
diff --git a/dependencies/attributes/customize.rb b/dependencies/attributes/customize.rb
new file mode 100644
index 0000000000..50933eaf50
--- /dev/null
+++ b/dependencies/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the dependencies cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "dependencies/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the gem binary:
+#
+#normal[:dependencies][:gem_binary] = '/my/gem/binary'
diff --git a/dependencies/attributes/default.rb b/dependencies/attributes/default.rb
index f05a1dab5e..7039d199bc 100644
--- a/dependencies/attributes/default.rb
+++ b/dependencies/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the dependencies cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "dependencies/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'dependencies/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:dependencies][:gems] = {}
 default[:dependencies][:debs] = {}
 default[:dependencies][:npms] = {}
@@ -27,3 +43,5 @@
 include_attribute "opsworks_nodejs::opsworks_nodejs" if node["opsworks"].has_key?("instance") &&
                                                         node["opsworks"]["instance"].has_key?("layers") &&
                                                         node["opsworks"]["instance"]["layers"].include?("nodejs-app")
+
+include_attribute "dependencies::customize"
diff --git a/deploy/attributes/customize.rb b/deploy/attributes/customize.rb
new file mode 100644
index 0000000000..14b003f79c
--- /dev/null
+++ b/deploy/attributes/customize.rb
@@ -0,0 +1,12 @@
+###
+# This is the place to override the deploy cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "deploy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the deploy user and shell:
+#
+#normal[:opsworks][:deploy_user][:shell] = '/bin/zsh'
+#normal[:opsworks][:deploy_user][:user] = 'deploy'
diff --git a/deploy/attributes/default.rb b/deploy/attributes/default.rb
index fb13a0a68a..bb013e769a 100644
--- a/deploy/attributes/default.rb
+++ b/deploy/attributes/default.rb
@@ -1 +1,18 @@
+###
+# Do not use this file to override the deploy cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "deploy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'deploy/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute "deploy::deploy"
+include_attribute "deploy::customize"
diff --git a/deploy/attributes/deploy.rb b/deploy/attributes/deploy.rb
index 1c20f9d857..f759aa58bc 100644
--- a/deploy/attributes/deploy.rb
+++ b/deploy/attributes/deploy.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the deploy cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "deploy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'deploy/attributes/deploy.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'deploy::logrotate'
 include_attribute 'deploy::rails_stack'
 
@@ -92,3 +108,5 @@
 end
 
 default[:opsworks][:skip_uninstall_of_other_rails_stack] = false
+
+include_attribute "deploy::customize"
diff --git a/deploy/attributes/logrotate.rb b/deploy/attributes/logrotate.rb
index 35be044661..1d3a6cb578 100644
--- a/deploy/attributes/logrotate.rb
+++ b/deploy/attributes/logrotate.rb
@@ -1,2 +1,20 @@
+###
+# Do not use this file to override the deploy cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "deploy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'deploy/attributes/logrotate.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:logrotate][:rotate] = 30
-default[:logrotate][:dateformat] = false # set to '-%Y%m%d' to have date formatted logs
\ No newline at end of file
+default[:logrotate][:dateformat] = false # set to '-%Y%m%d' to have date formatted logs
+
+include_attribute "deploy::customize"
diff --git a/deploy/attributes/rails_stack.rb b/deploy/attributes/rails_stack.rb
index b6872ab04f..40d761e749 100644
--- a/deploy/attributes/rails_stack.rb
+++ b/deploy/attributes/rails_stack.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the deploy cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "deploy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'deploy/attributes/rails_stack.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:opsworks][:rails_stack][:name] = "apache_passenger"
 case node[:opsworks][:rails_stack][:name]
 when "apache_passenger"
@@ -13,3 +29,5 @@
 else
   raise "Unknown stack: #{node[:opsworks][:rails_stack][:name].inspect}"
 end
+
+include_attribute "deploy::customize"
diff --git a/ebs/attributes/customize.rb b/ebs/attributes/customize.rb
new file mode 100644
index 0000000000..25d584e6ed
--- /dev/null
+++ b/ebs/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the ebs cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "ebs/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the mdadm chunk size:
+#
+#normal[:ebs][:mdadm_chunk_size] = '512'
diff --git a/ebs/attributes/default.rb b/ebs/attributes/default.rb
index f83aa80b33..69bbade57f 100644
--- a/ebs/attributes/default.rb
+++ b/ebs/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the deploy cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "ebs/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'ebs/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:ebs][:devices] ||= {}
 default[:ebs][:raids] ||= {}
 default[:ebs][:mdadm_chunk_size] = '256'
@@ -21,5 +37,6 @@
     set[:ebs][:raids][raid_device][:disks] = new_raid_devices
     skip_chars = new_raid_devices.size
   end
-
 end
+
+include_attribute "ebs::customize"
diff --git a/haproxy/attributes/customize.rb b/haproxy/attributes/customize.rb
new file mode 100644
index 0000000000..6bf2f7bcd9
--- /dev/null
+++ b/haproxy/attributes/customize.rb
@@ -0,0 +1,12 @@
+###
+# This is the place to override the haproxy cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "haproxy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the HA-Proxy stats url and user:
+#
+#normal[:haproxy][:stats_url] = '/haproxy?stats'
+#normal[:haproxy][:stats_user] = 'opsworks'
diff --git a/haproxy/attributes/default.rb b/haproxy/attributes/default.rb
index aa963805f6..f05e15166d 100644
--- a/haproxy/attributes/default.rb
+++ b/haproxy/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the haproxy cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "haproxy/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'haproxy/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_commons::default'
 
 rhel_arch = RUBY_PLATFORM.match(/64/) ? 'x86_64' : 'i686'
@@ -50,3 +66,5 @@ def random_haproxy_pw
 default[:haproxy][:enable_stats] = false
 
 default[:haproxy][:balance] = 'roundrobin'
+
+include_attribute "haproxy::customize"
diff --git a/memcached/attributes/customize.rb b/memcached/attributes/customize.rb
new file mode 100644
index 0000000000..26d8c66004
--- /dev/null
+++ b/memcached/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the memcached cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "memcached/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the memcached max connections:
+#
+#normal[:memcached][:max_connections] = "8192"
diff --git a/memcached/attributes/default.rb b/memcached/attributes/default.rb
index 76f535c82c..d7cc97d208 100644
--- a/memcached/attributes/default.rb
+++ b/memcached/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the memcached cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "memcached/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'memcached/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:memcached][:memory] = 512
 default[:memcached][:port] = 11211
 default[:memcached][:user] = "nobody"
@@ -15,3 +31,5 @@
 default[:memcached][:start_command] = "/etc/init.d/memcached start"
 default[:memcached][:stop_command] = "/etc/init.d/memcached stop"
 default[:memcached][:testing][:gem_version] = '1.6.1'
+
+include_attribute "memcached::customize"
diff --git a/mod_php5_apache2/attributes/customize.rb b/mod_php5_apache2/attributes/customize.rb
new file mode 100644
index 0000000000..e60cd8dc49
--- /dev/null
+++ b/mod_php5_apache2/attributes/customize.rb
@@ -0,0 +1,19 @@
+###
+# This is the place to override the mod_php5_apache2 cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "mod_php5_apache2/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the mod_php5_apache2 packages:
+#
+#normal[:mod_php5_apache2][:packages] = [ 'php-xml',
+#                                         'php-common',
+#                                         'php-xmlrpc',
+#                                         'php-devel',
+#                                         'php-gd',
+#                                         'php-cli',
+#                                         'php-pear-Auth-SASL',
+#                                         'php-mysql',
+#                                         'php-mcrypt' ]
diff --git a/mod_php5_apache2/attributes/default.rb b/mod_php5_apache2/attributes/default.rb
index fc15ab0687..51c81e9278 100644
--- a/mod_php5_apache2/attributes/default.rb
+++ b/mod_php5_apache2/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the mod_php5_apache2 cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "mod_php5_apache2/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'mod_php5_apache2/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 packages = []
 
 case node[:platform_family]
@@ -41,4 +57,6 @@
   ]
 end
 
-default[:mod_php5_apache2][:packages] = packages
\ No newline at end of file
+default[:mod_php5_apache2][:packages] = packages
+
+include_attribute "mod_php5_apache2::customize"
diff --git a/mysql/attributes/customize.rb b/mysql/attributes/customize.rb
new file mode 100644
index 0000000000..759522de14
--- /dev/null
+++ b/mysql/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the mysql cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "mysql/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the MySQL max_connections settings:
+#
+#normal[:mysql][:tunable][:max_connections]     = '512'
diff --git a/mysql/attributes/server.rb b/mysql/attributes/server.rb
index 1752b3e7c1..e5b865ee46 100644
--- a/mysql/attributes/server.rb
+++ b/mysql/attributes/server.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the mysql cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "mysql/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'mysql/attributes/server.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 require 'openssl'
 
 root_pw = String.new
@@ -86,3 +102,5 @@
 default[:mysql][:tunable][:long_query_time]     = 1
 
 default[:mysql][:clients] = []
+
+include_attribute "mysql::customize"
diff --git a/nginx/attributes/customize.rb b/nginx/attributes/customize.rb
new file mode 100644
index 0000000000..dbbac19786
--- /dev/null
+++ b/nginx/attributes/customize.rb
@@ -0,0 +1,12 @@
+###
+# This is the place to override the nginx cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "nginx/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to disable NGinx compression:
+#
+#normal[:nginx][:gzip] = 'off'
+#normal[:nginx][:gzip_static] = 'off'
diff --git a/nginx/attributes/nginx.rb b/nginx/attributes/nginx.rb
index 40cd2944df..0754ad6c98 100644
--- a/nginx/attributes/nginx.rb
+++ b/nginx/attributes/nginx.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the nginx cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "nginx/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'nginx/attributes/nginx.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 case node[:platform]
 when 'debian','ubuntu'
   default[:nginx][:dir]     = '/etc/nginx'
@@ -39,3 +55,5 @@
 default[:nginx][:worker_processes] = 10
 default[:nginx][:worker_connections] = 1024
 default[:nginx][:server_names_hash_bucket_size] = 64
+
+include_attribute "nginx::customize"
diff --git a/opsworks_agent_monit/attributes/customize.rb b/opsworks_agent_monit/attributes/customize.rb
new file mode 100644
index 0000000000..3c08bf7a76
--- /dev/null
+++ b/opsworks_agent_monit/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the opsworks_agent_monit cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_agent_monit/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/opsworks_agent_monit/attributes/default.rb b/opsworks_agent_monit/attributes/default.rb
index 0f085f7bb6..4af742777d 100644
--- a/opsworks_agent_monit/attributes/default.rb
+++ b/opsworks_agent_monit/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_agent_monit cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_agent_monit/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_agent_monit/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_initial_setup::default'
 
 case node[:platform]
@@ -8,3 +24,5 @@
   default[:monit][:conf]     = '/etc/monit/monitrc'
   default[:monit][:conf_dir] = '/etc/monit/conf.d'
 end
+
+include_attribute "opsworks_agent_monit::customize"
diff --git a/opsworks_bundler/attributes/bundler.rb b/opsworks_bundler/attributes/bundler.rb
index b10f159c61..a4471797f1 100644
--- a/opsworks_bundler/attributes/bundler.rb
+++ b/opsworks_bundler/attributes/bundler.rb
@@ -1,2 +1,20 @@
+###
+# Do not use this file to override the opsworks_bundler cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_bundler/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_bundler/attributes/bundler.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:opsworks_bundler][:version] = '1.5.1'
 default[:opsworks_bundler][:executable] = '/usr/local/bin/bundle'
+
+include_attribute "opsworks_bundler::customize"
diff --git a/opsworks_bundler/attributes/customize.rb b/opsworks_bundler/attributes/customize.rb
new file mode 100644
index 0000000000..2153e1c522
--- /dev/null
+++ b/opsworks_bundler/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_bundler cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_bundler/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the bundler version:
+#
+#normal[:opsworks_bundler][:version] = '1.3.5'
diff --git a/opsworks_cleanup/attributes/customize.rb b/opsworks_cleanup/attributes/customize.rb
new file mode 100644
index 0000000000..1c75a3d270
--- /dev/null
+++ b/opsworks_cleanup/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_cleanup cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_cleanup/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the number of log files kept:
+#
+#normal[:opsworks_cleanup][:keep_logs] = 5
diff --git a/opsworks_cleanup/attributes/default.rb b/opsworks_cleanup/attributes/default.rb
index a430fcd4f6..317b67f171 100644
--- a/opsworks_cleanup/attributes/default.rb
+++ b/opsworks_cleanup/attributes/default.rb
@@ -1,4 +1,22 @@
+###
+# Do not use this file to override the opsworks_cleanup cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_cleanup/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_cleanup/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_initial_setup::default'
 
 default[:opsworks_cleanup][:keep_logs] = 10
 default[:opsworks_cleanup][:log_dir] = "#{node[:opsworks_agent][:shared_dir]}/chef"
+
+include_attribute "opsworks_cleanup::customize"
diff --git a/opsworks_commons/attributes/customize.rb b/opsworks_commons/attributes/customize.rb
new file mode 100644
index 0000000000..bddb23412e
--- /dev/null
+++ b/opsworks_commons/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the opsworks_commons cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_commons/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/opsworks_commons/attributes/default.rb b/opsworks_commons/attributes/default.rb
index 852de2fa00..4b068a880c 100644
--- a/opsworks_commons/attributes/default.rb
+++ b/opsworks_commons/attributes/default.rb
@@ -1,3 +1,21 @@
+###
+# Do not use this file to override the opsworks_commons cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_commons/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_commons/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default[:opsworks_commons][:assets_url] = 'https://opsworks-instance-assets.s3.amazonaws.com'
 
 default[:ruby][:executable] = '/usr/local/bin/ruby'
+
+include_attribute "opsworks_commons::customize"
diff --git a/opsworks_custom_cookbooks/attributes/customize.rb b/opsworks_custom_cookbooks/attributes/customize.rb
new file mode 100644
index 0000000000..39bdf6a008
--- /dev/null
+++ b/opsworks_custom_cookbooks/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_custom_cookbooks cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_custom_cookbooks/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to disable submodules for your site-cookbooks:
+#
+#normal[:opsworks_custom_cookbooks][:enable_submodules] = false
diff --git a/opsworks_custom_cookbooks/attributes/default.rb b/opsworks_custom_cookbooks/attributes/default.rb
index ab424c5e4f..0d9dd0d126 100644
--- a/opsworks_custom_cookbooks/attributes/default.rb
+++ b/opsworks_custom_cookbooks/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_custom_cookbooks cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_custom_cookbooks/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_custom_cookbooks/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_initial_setup::default'
 
 default[:opsworks_custom_cookbooks][:enabled] = false
@@ -17,3 +33,5 @@
 
 default[:opsworks_custom_cookbooks][:scm][:revision] = 'HEAD'
 default[:opsworks_custom_cookbooks][:enable_submodules] = true
+
+include_attribute "opsworks_custom_cookbooks::customize"
diff --git a/opsworks_ganglia/attributes/customize.rb b/opsworks_ganglia/attributes/customize.rb
new file mode 100644
index 0000000000..0535bdc1c4
--- /dev/null
+++ b/opsworks_ganglia/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_ganglia cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_ganglia/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Ganglia user
+#
+#normal[:ganglia][:user] = 'cacti'
diff --git a/opsworks_ganglia/attributes/default.rb b/opsworks_ganglia/attributes/default.rb
index 12f106eefc..f1112b7ebc 100644
--- a/opsworks_ganglia/attributes/default.rb
+++ b/opsworks_ganglia/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_ganglia cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_ganglia/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_ganglia/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 require 'securerandom'
 
 include_attribute 'opsworks_initial_setup::default'
@@ -29,7 +45,7 @@
   default[:ganglia][:gmetad_package] = "#{node[:ganglia][:gmetad_package_name]}_#{node[:ganglia][:custom_package_version]}_#{node[:ganglia][:package_arch]}.deb"
   default[:ganglia][:web_frontend_package] = "#{node[:ganglia][:web_frontend_package_name]}_#{node[:ganglia][:custom_package_version]}_all.deb"
   default[:ganglia][:monitor_plugins_package] = "#{node[:ganglia][:monitor_plugins_package_name]}_#{node[:ganglia][:custom_package_version]}_all.deb"
- 
+
   default[:ganglia][:gmetad_package_url] = "#{node[:ganglia][:package_base_url]}/#{node[:ganglia][:gmetad_package]}"
   default[:ganglia][:web_frontend_package_url] = "#{node[:ganglia][:package_base_url]}/#{node[:ganglia][:web_frontend_package]}"
   default[:ganglia][:monitor_plugins_package_url] = "#{node[:ganglia][:package_base_url]}/#{node[:ganglia][:monitor_plugins_package]}"
@@ -54,4 +70,6 @@
                                       "/usr/share/ganglia"
                                     when "debian"
                                       "/usr/share/ganglia-webfrontend"
-                                    end 
+                                    end
+
+include_attribute "opsworks_ganglia::customize"
diff --git a/opsworks_initial_setup/attributes/customize.rb b/opsworks_initial_setup/attributes/customize.rb
new file mode 100644
index 0000000000..dbb58f071b
--- /dev/null
+++ b/opsworks_initial_setup/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_initial_setup cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_initial_setup/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override OpsWorks default TCP keepalive timeout:
+#
+#normal[:opsworks_initial_setup][:sysctl]['net.ipv4.tcp_keepalive_time'] = 2048
diff --git a/opsworks_initial_setup/attributes/default.rb b/opsworks_initial_setup/attributes/default.rb
index ed21665e09..ff44a4956b 100644
--- a/opsworks_initial_setup/attributes/default.rb
+++ b/opsworks_initial_setup/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_initial_setup cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_initial_setup/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_initial_setup/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 GC.disable unless node[:opsworks] && node[:opsworks][:instance] && node[:opsworks][:instance][:instance_type] == 't1.micro'
 
 # this values must match the ones respective ones in the agent configuration
@@ -65,3 +81,5 @@
 
 # landscape removal
 default[:opsworks_initial_setup][:landscape][:packages_to_remove] = ['landscape-common', 'landscape-client']
+
+include_attribute "opsworks_initial_setup::customize"
diff --git a/opsworks_java/attributes/customize.rb b/opsworks_java/attributes/customize.rb
new file mode 100644
index 0000000000..e503ae0351
--- /dev/null
+++ b/opsworks_java/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_java cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_java/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Tomcat threadpool max size:
+#
+#normal['opsworks_java']['tomcat']['threadpool_max_threads'] = 150
diff --git a/opsworks_java/attributes/default.rb b/opsworks_java/attributes/default.rb
index bcbdcdef8f..e78c7b6c7e 100644
--- a/opsworks_java/attributes/default.rb
+++ b/opsworks_java/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_java cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_java/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_java/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 default['opsworks_java'] = {}
 
 default['opsworks_java']['jvm'] = 'openjdk'
@@ -55,3 +71,5 @@
   default['opsworks_java']['tomcat']['group'] = 'tomcat'
   default['opsworks_java']['tomcat']['system_env_dir'] = '/etc/sysconfig'
 end
+
+include_attribute "opsworks_java::customize"
diff --git a/opsworks_nodejs/attributes/customize.rb b/opsworks_nodejs/attributes/customize.rb
new file mode 100644
index 0000000000..bbcb6b4848
--- /dev/null
+++ b/opsworks_nodejs/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_nodejs cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_nodejs/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Nodejs version:
+#
+#normal[:opsworks_nodejs][:version] = '0.10.21'
diff --git a/opsworks_nodejs/attributes/opsworks_nodejs.rb b/opsworks_nodejs/attributes/opsworks_nodejs.rb
index 5461f1e76b..0e9e99f21d 100644
--- a/opsworks_nodejs/attributes/opsworks_nodejs.rb
+++ b/opsworks_nodejs/attributes/opsworks_nodejs.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_nodejs cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_nodejs/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_nodejs/attributes/opsworks_nodejs.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'deploy'
 include_attribute 'opsworks_commons::default'
 
@@ -11,3 +27,5 @@
 rhel_arch = RUBY_PLATFORM.match(/64/) ? 'x86_64' : 'i686'
 default[:opsworks_nodejs][:rpm] = "opsworks-nodejs-#{node[:opsworks_nodejs][:version]}-#{node[:opsworks_nodejs][:pkgrelease]}.#{rhel_arch}.rpm"
 default[:opsworks_nodejs][:rpm_url] = "#{node[:opsworks_commons][:assets_url]}/packages/#{node[:platform]}/#{node[:platform_version]}/#{node[:opsworks_nodejs][:rpm]}"
+
+include_attribute "opsworks_nodejs::customize"
diff --git a/opsworks_rubygems/attributes/customize.rb b/opsworks_rubygems/attributes/customize.rb
new file mode 100644
index 0000000000..2e7f783cff
--- /dev/null
+++ b/opsworks_rubygems/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the opsworks_rubygems cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "opsworks_rubygems/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Rubygems version:
+#
+#normal['opsworks_rubygems']['version'] = '2.1.7'
diff --git a/opsworks_rubygems/attributes/rubygems.rb b/opsworks_rubygems/attributes/rubygems.rb
index d65109cd6c..825e8890d2 100644
--- a/opsworks_rubygems/attributes/rubygems.rb
+++ b/opsworks_rubygems/attributes/rubygems.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the opsworks_rubygems cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "opsworks_rubygems/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'opsworks_rubygems/attributes/rubygems.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_initial_setup::default'
 
 default['opsworks_rubygems']['version'] = '2.1.7'
@@ -10,3 +26,5 @@
   # set --disable-gems for Ruby 1.9 and later
   default['opsworks_rubygems']['setup_command'] = "/usr/bin/env LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 /usr/local/bin/ruby --disable-gems setup.rb --no-rdoc --no-ri"
 end
+
+include_attribute "opsworks_rubygems::customize"
diff --git a/packages/attributes/customize.rb b/packages/attributes/customize.rb
new file mode 100644
index 0000000000..642c39c0dc
--- /dev/null
+++ b/packages/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the packages cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "packages/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/packages/attributes/packages.rb b/packages/attributes/packages.rb
index 94158afef5..7add009836 100644
--- a/packages/attributes/packages.rb
+++ b/packages/attributes/packages.rb
@@ -1,3 +1,21 @@
+###
+# Do not use this file to override the packages cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "packages/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'packages/attributes/packages.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 # Toggle for recipes to determine if we should rely on distribution packages
 # or gems.
 default[:packages][:dist_only] = false
+
+include_attribute "packages::customize"
diff --git a/passenger_apache2/attributes/customize.rb b/passenger_apache2/attributes/customize.rb
new file mode 100644
index 0000000000..7c0e32c4ce
--- /dev/null
+++ b/passenger_apache2/attributes/customize.rb
@@ -0,0 +1,12 @@
+###
+# This is the place to override the passenger_apache2 cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "passenger_apache2/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Passenger pool size and lower the idle time:
+#
+#normal[:passenger][:pool_idle_time] = 3600
+#normal[:passenger][:max_pool_size] = 16
diff --git a/passenger_apache2/attributes/passenger.rb b/passenger_apache2/attributes/passenger.rb
index 68c12d857e..3ce4588be5 100644
--- a/passenger_apache2/attributes/passenger.rb
+++ b/passenger_apache2/attributes/passenger.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the passenger_apache2 cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "passenger_apache2/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'passenger_apache2/attributes/passenger.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 require 'rubygems/version'
 
 include_attribute 'opsworks_initial_setup::default'
@@ -48,3 +64,5 @@
 default[:passenger][:rails_spawn_method] = 'smart-lv2'
 default[:passenger][:max_pool_size] = 8 # usually will be set by OpsWorks directy. Override if you need a custom size
 default[:passenger][:friendly_error_pages] = 'off'
+
+include_attribute "passenger_apache2::customize"
diff --git a/php/attributes/customize.rb b/php/attributes/customize.rb
new file mode 100644
index 0000000000..8505f3fb84
--- /dev/null
+++ b/php/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the php cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "php/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/php/attributes/default.rb b/php/attributes/default.rb
index a0affc1c55..47b08bfaa9 100644
--- a/php/attributes/default.rb
+++ b/php/attributes/default.rb
@@ -1 +1,19 @@
-include_attribute 'deploy'
\ No newline at end of file
+###
+# Do not use this file to override the php cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "php/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'php/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
+include_attribute 'deploy'
+
+include_attribute "php::customize"
diff --git a/rails/attributes/customize.rb b/rails/attributes/customize.rb
new file mode 100644
index 0000000000..ff7223dbb0
--- /dev/null
+++ b/rails/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the rails cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "rails/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Rails version used:
+#
+#normal[:rails][:version] = "2.3.18"
diff --git a/rails/attributes/rails.rb b/rails/attributes/rails.rb
index 0af7038bcf..3ab18e1cab 100644
--- a/rails/attributes/rails.rb
+++ b/rails/attributes/rails.rb
@@ -1,3 +1,21 @@
+###
+# Do not use this file to override the rails cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "rails/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'rails/attributes/rails.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute "deploy"
 
 default[:rails][:version] = "2.3.5"
+
+include_attribute "rails::customize"
diff --git a/ruby/attributes/customize.rb b/ruby/attributes/customize.rb
new file mode 100644
index 0000000000..d4df09a2cd
--- /dev/null
+++ b/ruby/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the ruby cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "ruby/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/ruby/attributes/ruby.rb b/ruby/attributes/ruby.rb
index b0b6655d0c..681e45ad3c 100644
--- a/ruby/attributes/ruby.rb
+++ b/ruby/attributes/ruby.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the ruby cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "ruby/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'ruby/attributes/ruby.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_initial_setup::default'
 include_attribute 'opsworks_commons::default'
 
@@ -49,3 +65,5 @@
 
 default[:ruby][:rpm] = "opsworks-ruby#{node[:ruby][:major_version].delete('.')}-#{node[:ruby][:full_version]}-#{node[:ruby][:patch]}-#{node[:ruby][:pkgrelease]}.#{rhel_arch}.rpm" unless node[:ruby][:rpm]
 default[:ruby][:rpm_url] = "#{node[:opsworks_commons][:assets_url]}/packages/#{_platform}/#{_platform_version}/#{node[:ruby][:rpm]}"
+
+include_attribute "ruby::customize"
diff --git a/ruby_enterprise/attributes/customize.rb b/ruby_enterprise/attributes/customize.rb
new file mode 100644
index 0000000000..b8a7f51cc1
--- /dev/null
+++ b/ruby_enterprise/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the ruby_enterprise cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "ruby_enterprise/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/ruby_enterprise/attributes/ruby_enterprise.rb b/ruby_enterprise/attributes/ruby_enterprise.rb
index a6bc766960..dc09c0ced1 100644
--- a/ruby_enterprise/attributes/ruby_enterprise.rb
+++ b/ruby_enterprise/attributes/ruby_enterprise.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the ruby_enterprise cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "ruby_enterprise/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'ruby_enterprise/attributes/ruby_enterprise.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'opsworks_commons::default'
 include_attribute 'opsworks_rubygems::rubygems'
 
@@ -20,3 +36,5 @@
 default[:ruby_enterprise][:gc][:heap_slots_growth_factor] = 1
 default[:ruby_enterprise][:gc][:malloc_limit]             = 50000000
 default[:ruby_enterprise][:gc][:heap_free_min]            = 4096
+
+include_attribute "ruby_enterprise::customize"
diff --git a/runit/attributes/customize.rb b/runit/attributes/customize.rb
new file mode 100644
index 0000000000..7c8e5d0422
--- /dev/null
+++ b/runit/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the runit cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "runit/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/ssh_users/attributes/customize.rb b/ssh_users/attributes/customize.rb
new file mode 100644
index 0000000000..a5e2ccb3d3
--- /dev/null
+++ b/ssh_users/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the ssh_users cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "ssh_users/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/ssh_users/attributes/default.rb b/ssh_users/attributes/default.rb
index e0a80456ef..74a145d312 100644
--- a/ssh_users/attributes/default.rb
+++ b/ssh_users/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the ssh_users cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "ssh_users/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'ssh_users/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 require 'etc'
 
 include_attribute 'opsworks_initial_setup::default'
@@ -13,3 +29,5 @@
 else
   default[:sudoers] = []
 end
+
+include_attribute "ssh_users::customize"
diff --git a/test_suite/attributes/customize.rb b/test_suite/attributes/customize.rb
new file mode 100644
index 0000000000..3756d75f03
--- /dev/null
+++ b/test_suite/attributes/customize.rb
@@ -0,0 +1,7 @@
+###
+# This is the place to override the test_suite cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "test_suite/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
diff --git a/test_suite/attributes/default.rb b/test_suite/attributes/default.rb
index 158aab1ad0..dbe736beee 100644
--- a/test_suite/attributes/default.rb
+++ b/test_suite/attributes/default.rb
@@ -1,2 +1,20 @@
+###
+# Do not use this file to override the test_suite cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "test_suite/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'test_suite/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 # the version of minitest-chef-handler that comes with the agent
 default[:test_suite][:minitest_chef_handler][:version] = '1.0.1'
+
+include_attribute "test_suite::customize"
diff --git a/unicorn/attributes/customize.rb b/unicorn/attributes/customize.rb
new file mode 100644
index 0000000000..73a5afc81f
--- /dev/null
+++ b/unicorn/attributes/customize.rb
@@ -0,0 +1,11 @@
+###
+# This is the place to override the unicorn cookbook's default attributes.
+#
+# Do not edit THIS file directly. Instead, create
+# "unicorn/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+###
+
+# The following shows how to override the Unicorn timout:
+#
+#normal[:unicorn][:timeout] = 30
diff --git a/unicorn/attributes/default.rb b/unicorn/attributes/default.rb
index 3b5e323724..c2707479b5 100644
--- a/unicorn/attributes/default.rb
+++ b/unicorn/attributes/default.rb
@@ -1,3 +1,19 @@
+###
+# Do not use this file to override the unicorn cookbook's default
+# attributes.  Instead, please use the customize.rb attributes file,
+# which will keep your adjustments separate from the AWS OpsWorks
+# codebase and make it easier to upgrade.
+#
+# However, you should not edit customize.rb directly. Instead, create
+# "unicorn/attributes/customize.rb" in your cookbook repository and
+# put the overrides in YOUR customize.rb file.
+#
+# Do NOT create an 'unicorn/attributes/default.rb' in your cookbooks. Doing so
+# would completely override this file and might cause upgrade issues.
+#
+# See also: http://docs.aws.amazon.com/opsworks/latest/userguide/customizing.html
+###
+
 include_attribute 'rails::rails'
 
 default[:unicorn][:worker_processes] = node[:rails][:max_pool_size] ? node[:rails][:max_pool_size] : 4
@@ -9,4 +25,6 @@
 default[:unicorn][:tcp_nopush] = false
 default[:unicorn][:tries] = 5
 default[:unicorn][:delay] = 0.5
-default[:unicorn][:accept_filter] = "httpready"
\ No newline at end of file
+default[:unicorn][:accept_filter] = "httpready"
+
+include_attribute "unicorn::customize"