diff --git a/railties/configs/empty.log b/railties/configs/empty.log
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index c46989819d52dee2e52704217a1e3a624153532b..ed9b2d9636be1ab484915a2c8b1f0aa29eb2209f 100644
--- a/railties/lib/rails_generator.rb
+++ b/railties/lib/rails_generator.rb
@@ -23,7 +23,7 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'rails_generator/support/core_ext'
+require 'support/core_ext'
 
 require 'rails_generator/base'
 require 'rails_generator/lookup'
diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb
index 92a54e24534c82f04acca4b39121cabbe5126c71..b8c926f3cebd8d54156172ba65f89e3e23bd24a9 100644
--- a/railties/lib/rails_generator/base.rb
+++ b/railties/lib/rails_generator/base.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/support/class_attribute_accessors'
-require File.dirname(__FILE__) + '/support/inflector'
+require File.dirname(__FILE__) + '/../support/class_attribute_accessors'
+require File.dirname(__FILE__) + '/../support/inflector'
 require File.dirname(__FILE__) + '/options'
 require File.dirname(__FILE__) + '/manifest'
 require File.dirname(__FILE__) + '/spec'
diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb
index 54785413efacf4686c1bba80c24777630b4ed980..4ddeb948876400cbd7453a1932d67a93e5d660f4 100644
--- a/railties/lib/rails_generator/options.rb
+++ b/railties/lib/rails_generator/options.rb
@@ -1,5 +1,5 @@
 require 'optparse'
-require File.dirname(__FILE__) + '/support/class_inheritable_attributes'
+require File.dirname(__FILE__) + '/../support/class_inheritable_attributes'
 
 module Rails
   module Generator