diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index fa0ee778c906fcaf2aae5de1dd05b42432c803e4..daf30e434a933089426c2f332e441d51230bb09d 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -13,7 +13,7 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'actionmailer'
 
-  s.files        = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
+  s.files        = Dir['CHANGELOG', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*']
   s.require_path = 'lib'
   s.requirements << 'none'
 
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 9ce7ba5f0262a42cd2fb8ca987ec08edf8ae3ae6..99deff234c93795921a3b31c803e107f5179466a 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -13,7 +13,7 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'actionpack'
 
-  s.files        = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
+  s.files        = Dir['CHANGELOG', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*']
   s.require_path = 'lib'
   s.requirements << 'none'
 
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index 6bd6fe49ff08529bc639e579cbaa7f211810e30b..c483ecbc3c1eb3808df469dc7348abdfc50815aa 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -14,7 +14,7 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'activemodel'
 
-  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README', 'lib/**/*']
+  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
 
   s.has_rdoc = true
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index ce10404feb15a194e3739698bd0eb6fb4f0361e5..67d521d56baf1ed5b5093612f24b39a84f114a66 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -14,12 +14,12 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'activerecord'
 
-  s.files        = Dir['CHANGELOG', 'README', 'examples/**/*', 'lib/**/*']
+  s.files        = Dir['CHANGELOG', 'README.rdoc', 'examples/**/*', 'lib/**/*']
   s.require_path = 'lib'
 
   s.has_rdoc         = true
-  s.extra_rdoc_files = %w( README )
-  s.rdoc_options.concat ['--main',  'README']
+  s.extra_rdoc_files = %w( README.rdoc )
+  s.rdoc_options.concat ['--main',  'README.rdoc']
 
   s.add_dependency('activesupport', version)
   s.add_dependency('activemodel',   version)
diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec
index ca74c0dd7d24566a8bbe37dc569a4815e6176475..a71168722b15fcb679fe887498540fba5b7e4250 100644
--- a/activeresource/activeresource.gemspec
+++ b/activeresource/activeresource.gemspec
@@ -14,12 +14,12 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'activeresource'
 
-  s.files        = Dir['CHANGELOG', 'README', 'examples/**/*', 'lib/**/*']
+  s.files        = Dir['CHANGELOG', 'README.rdoc', 'examples/**/*', 'lib/**/*']
   s.require_path = 'lib'
 
   s.has_rdoc         = true
-  s.extra_rdoc_files = %w( README )
-  s.rdoc_options.concat ['--main',  'README']
+  s.extra_rdoc_files = %w( README.rdoc )
+  s.rdoc_options.concat ['--main',  'README.rdoc']
 
   s.add_dependency('activesupport', version)
   s.add_dependency('activemodel',   version)
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 8611a1e5fad6be63d7feb37f2c3ed0f97b94ac2c..df7f68fecf9f42b072fbc7f7198fc28e5ddac93e 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -14,7 +14,7 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'activesupport'
 
-  s.files        = Dir['CHANGELOG', 'README', 'lib/**/*']
+  s.files        = Dir['CHANGELOG', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
 
   s.has_rdoc = true
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 492f05e3cc5229c4c1c818bf90cce94ea0bc9854..843d2b4e82d39829771f53f7eaf151e6e38bdae1 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -55,46 +55,46 @@ namespace :doc do
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
     rdoc.options << '--line-numbers' << '--inline-source'
-    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('README.rdoc')
 
     gem_path('actionmailer') do |actionmailer|
-      %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
         rdoc.rdoc_files.include("#{actionmailer}/#{file}")
       end
     end
 
     gem_path('actionpack') do |actionpack|
-      %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{actionpack}/#{file}")
       end
     end
 
     gem_path('activemodel') do |activemodel|
-      %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activemodel}/#{file}")
       end
     end
 
     gem_path('activerecord') do |activerecord|
-      %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG lib/active_record/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activerecord}/#{file}")
       end
     end
 
     gem_path('activeresource') do |activeresource|
-      %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+      %w(README.rdoc CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
         rdoc.rdoc_files.include("#{activeresource}/#{file}")
       end
     end
 
     gem_path('activesupport') do |activesupport|
-      %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG lib/active_support/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activesupport}/#{file}")
       end
     end
 
     gem_path('railties') do |railties|
-      %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+      %w(README.rdoc CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
         rdoc.rdoc_files.include("#{railties}/#{file}")
       end
     end
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 247b926af9069215f319bad1244ed6458c040ed6..38dcb17ff12f3e6c0eb400d6d0c6dc8aea929dc3 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -13,7 +13,7 @@
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'rails'
 
-  s.files              = Dir['CHANGELOG', 'README', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
+  s.files              = Dir['CHANGELOG', 'README.rdoc', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
   s.require_path       = 'lib'
 
   s.rdoc_options << '--exclude' << '.'