diff --git a/ChangeLog b/ChangeLog
index 6e28b0fcd6..22dfcfdf21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 28 10:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642]
+
 Sun Apr 28 09:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* object.c: Documentation for taint and trust [Bug #8162]
diff --git a/lib/yaml.rb b/lib/yaml.rb
index f2177accbd..484cd06941 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -79,5 +79,5 @@ end
 #
 # 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
+module YAML end if false
 YAML = Psych