diff --git a/ChangeLog b/ChangeLog
index 9e2fda80ed..7ecaa3e96e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 27 23:53:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* lib/yaml.rb: add security warning to YAML documentation
+
 Sat Apr 27 23:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/yaml.rb: Documentation for YAML module [Bug #8213]
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 76657cdd0b..f2177accbd 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -73,6 +73,10 @@ end
 #     YAML.dump("foo")     # => "--- foo\n...\n"
 #     { :a => 'b'}.to_yaml  # => "---\n:a: b\n"
 #
+# Do not use YAML to load untrusted data. Doing so is unsafe and could allow
+# malicious input to execute arbitrary code inside your application. Please see
+# doc/security.rdoc for more information.
+#
 # For more advanced details on the implementation see Psych, and also check out
 # yaml.org for spec details and other helpful information.
 module YAML; end