diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 6009c6b584554c931b4ad3f65978c85cb0f96e70..ef1144b546bf7ce6292e7e965403e81fa5b37304 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,11 @@
 *SVN*
 
+* Remove explicit loading of RailsInfo and RailsInfoController. [Nicholas Seckar]
+
+* Move RailsInfo and RailsInfoController to Rails::Info and Rails::InfoController. [Nicholas Seckar]
+
+* Extend load path with Railties' builtin directory to make adding support code easy. [Nicholas Seckar]
+
 * Fix the rails_info controller by explicitly loading it, and marking it as not reloadable. [Nicholas Seckar]
 
 * Fixed rails:freeze:gems for Windows #3274 [paul@paulbutcher.com]
diff --git a/railties/builtin/controllers/rails_info_controller.rb b/railties/builtin/controllers/rails_info_controller.rb
deleted file mode 100644
index ff943b130a8ccf99aea79a4877bc1f3416c3c4e6..0000000000000000000000000000000000000000
--- a/railties/builtin/controllers/rails_info_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class RailsInfoController < ActionController::Base
-  
-  def self.reloadable?() false end
-  
-  def properties
-    if local_request?
-      render :inline => Rails::Info.to_html
-    else
-      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500
-    end
-  end
-end
diff --git a/railties/lib/rails_info.rb b/railties/builtin/rails_info/rails/info.rb
similarity index 97%
rename from railties/lib/rails_info.rb
rename to railties/builtin/rails_info/rails/info.rb
index 86c3fec841b09960d0b5d690c6bc10ed52864dc3..9ded9e064918a1597c21cdd0d49bc5ae17abe7d0 100644
--- a/railties/lib/rails_info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -1,5 +1,4 @@
 require 'rails_version'
-require File.join(File.dirname(File.dirname(__FILE__)), 'builtin/controllers/rails_info_controller')
 
 module Rails
   module Info
diff --git a/railties/builtin/rails_info/rails/info_controller.rb b/railties/builtin/rails_info/rails/info_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7534447043c1d6b7b74fe01bc62894ded3538c6e
--- /dev/null
+++ b/railties/builtin/rails_info/rails/info_controller.rb
@@ -0,0 +1,11 @@
+module Rails
+  class InfoController < ActionController::Base
+    def properties
+      if local_request?
+        render :inline => Rails::Info.to_html
+      else
+        render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/html/index.html b/railties/html/index.html
index 1f5e62bb16200facb7a747977f85b404101a8eb4..d739d4b27e5684fbd5af9f0b762d84384d113d36 100644
--- a/railties/html/index.html
+++ b/railties/html/index.html
@@ -183,7 +183,7 @@
     <script type="text/javascript">
       function about() {
         if (Element.empty('about-content')) {
-          new Ajax.Updater('about-content', 'rails_info/properties', {
+          new Ajax.Updater('about-content', 'rails/info/properties', {
             method:     'get',
             onFailure:  function() {Element.classNames('about-content').add('failure')},
             onComplete: function() {new Effect.BlindDown('about-content', {duration: 0.25})}
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 6a2e765dbf6dbb78736baed82024866217a1bb12..132c70cd2190e1fa1ceb2e818214755ae8b0b56f 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -96,7 +96,7 @@ def process
       # the individual base class configurations.
       load_environment
       
-      load_framework_info
+      add_support_load_paths
 
       load_plugins
 
@@ -129,10 +129,10 @@ def require_frameworks
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
     
-    # Loads Rails::VERSION and Rails::Info.
-    # TODO: Make this work via dependencies.rb/const_missing instead.
-    def load_framework_info
-      require 'rails_info'
+    # Add the load paths used by support functions such as the info controller
+    def add_support_load_paths
+      builtins = File.join(File.dirname(File.dirname(__FILE__)), 'builtin', '*')
+      $LOAD_PATH.concat(Dir[builtins])
     end
 
     # Loads all plugins in <tt>config.plugin_paths</tt>.  <tt>plugin_paths</tt>