diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake
index fe2a8c09b86db..0efef476853e5 100644
--- a/railties/lib/tasks/framework.rake
+++ b/railties/lib/tasks/framework.rake
@@ -4,10 +4,11 @@ task :freeze_gems do
   mkdir_p "vendor/rails"
   
   for gem in %w( actionpack activerecord actionmailer activesupport actionwebservice )
-    system "cd vendor/rails; gem unpack #{gem}; mv #{gem}* #{gem}"
+    system "cd vendor/rails; gem unpack #{gem}"
+    FileUtils.mv(Dir.glob("vendor/rails/#{gem}*").first, "vendor/rails/#{gem}")
   end
   
-  system "cd vendor/rails; gem unpack rails; mv rails* railties"
+  FileUtils.mv(Dir.glob("vendor/rails/rails*").first, "vendor/rails/railties")
 end
 
 desc "Lock this application to the Edge Rails (by exporting from Subversion)"