diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 04f2b2bd87..4cd8572d00 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added update_javascripts task which will fetch all the latest js files from your current rails install. Use after updating rails. [Tobias Luetke]
+
 * Added cleaning of RAILS_ROOT to useless elements such as '../non-dot-dot/'. Provides cleaner backtraces and error messages. [Nicholas Seckar]
 
 * Made the instantiated/transactional fixtures settings be controlled through Rails::Initializer. Transactional and non-instantiated fixtures are default from now on. [Florian Weber]
diff --git a/railties/lib/railties_path.rb b/railties/lib/railties_path.rb
new file mode 100644
index 0000000000..b08ced8be5
--- /dev/null
+++ b/railties/lib/railties_path.rb
@@ -0,0 +1 @@
+RAILTIES_PATH = File.expand_path(File.dirname(__FILE__))
\ No newline at end of file
diff --git a/railties/lib/tasks/javascripts.rake b/railties/lib/tasks/javascripts.rake
new file mode 100644
index 0000000000..91965c8918
--- /dev/null
+++ b/railties/lib/tasks/javascripts.rake
@@ -0,0 +1,6 @@
+
+desc "Update your javascripts from your current rails install."
+task :update_javascripts do 
+  require 'railties_path'  
+  FileUtils.cp(Dir[RAILTIES_PATH + '/../html/javascripts/*.js'], RAILS_ROOT + '/public/javascripts/')
+end