diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 746e15f808..5231d37c4d 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require File.join(File.dirname(__FILE__), 'lib', 'version')
+require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionmailer'
diff --git a/actionmailer/lib/version.rb b/actionmailer/lib/action_mailer/version.rb
similarity index 100%
rename from actionmailer/lib/version.rb
rename to actionmailer/lib/action_mailer/version.rb