2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32866d1c46..7d3feb434b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 28 23:34:01 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/yaml.rb: Use another trick to define the YAML module.
+	  https://twitter.com/n0kada/status/328342207511801856
+
 Sun Apr 28 23:19:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/pp.rb: Update PP module overview by @geopet
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 484cd06941..a0cef570cb 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -12,6 +12,8 @@ rescue LoadError
   raise
 end
 
+YAML = Psych
+
 module Psych # :nodoc:
   class EngineManager
     # Returns the YAML engine in use.
@@ -79,5 +81,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 if false
-YAML = Psych
+module YAML
+end