1 files changed, 12 insertions, 6 deletions
diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb
index d43dfc8323..2e9c89d834 100644
--- a/lib/rubygems/package_task.rb
+++ b/lib/rubygems/package_task.rb
@@ -1,3 +1,9 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
 # Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -111,14 +117,14 @@ class Gem::PackageTask < Rake::PackageTask
     Gem.configuration.verbose = trace
 
     file gem_path => [package_dir, gem_dir] + @gem_spec.files do
-      when_writing "Creating #{gem_spec.file_name}" do
-        Gem::Builder.new(gem_spec).build
-        verbose trace do
-          mv gem_file, gem_path
+      chdir(gem_dir) do
+        when_writing "Creating #{gem_spec.file_name}" do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, ".."
+          }
         end
       end
     end
   end
-
 end
-