diff --git a/fserver.drush.inc b/fserver.drush.inc
index 4326eb7..2568ca0 100644
--- a/fserver.drush.inc
+++ b/fserver.drush.inc
@@ -382,9 +382,9 @@ class FserverProject_git {
         // Create the directory if it doesn't exist.
         if (file_check_directory($file_path, TRUE)) {
           $vc = $tag['original'];
-          drush_op('drush_shell_exec', "git --git-dir={$this->path}/.git checkout {$vc}");
+          drush_op('drush_shell_exec', "git --git-dir={$this->path}/.git --work-tree={$this->path} checkout {$vc}");
           $this->FserverProject->write_package_info($tag, array('.git'));
-          drush_op('drush_shell_exec', "tar -Pcf - --exclude='.git' --transform='s,{$this->path},{$this->FserverProject->name},' {$this->path} | gzip > {$file_path}/{$base}.tgz");
+          drush_op('drush_shell_exec', "tar -cf - --exclude='.git' -C {$this->path} ./ | gzip > {$file_path}/{$base}.tgz");
 
           // @TODO
           // We need to properly chown and permission these directories.