diff --git a/ChangeLog b/ChangeLog
index 8b720c3d13..17b7d23b1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 22 04:46:22 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: remove autoload from psych
+	* ext/psych/lib/psych/json.rb: ditto
+
 Tue Nov 22 00:44:59 2011  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_io.rb (test_fcntl_dupfd): the argument of F_DUPFD is
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index 497f5952a3..ebf2b35d14 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -10,7 +10,9 @@ require 'psych/set'
 require 'psych/coder'
 require 'psych/core_ext'
 require 'psych/deprecated'
-require 'psych/json'
+require 'psych/stream'
+require 'psych/json/tree_builder'
+require 'psych/json/stream'
 
 ###
 # = Overview
@@ -101,8 +103,6 @@ module Psych
   class BadAlias < Exception
   end
 
-  autoload :Stream, 'psych/stream'
-
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
diff --git a/ext/psych/lib/psych/json.rb b/ext/psych/lib/psych/json.rb
deleted file mode 100644
index 412ab2708b..0000000000
--- a/ext/psych/lib/psych/json.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Psych
-  module JSON
-    autoload :TreeBuilder, 'psych/json/tree_builder'
-    autoload :Stream, 'psych/json/stream'
-  end
-end