diff --git a/bootstrap.sh b/bootstrap.sh
index 641dedb59..63acf1594 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -206,6 +206,7 @@ done
 
 github_project="$github_user-cappuccino-base"
 github_path="$github_user/cappuccino-base"
+local_project="cappuccino-base"
 
 # The purpose of bootstrap is to install Cappuccino.
 install_cappuccino="yes"
@@ -317,9 +318,9 @@ if [ "$install_cappuccino" ]; then
         unzip $quiet_arg "$local_distrib" -d "$install_directory"
         check_and_exit
 
-        mv "$install_directory/$github_project-"*/* "$install_directory/."
+        mv "$install_directory/$local_project-"*/* "$install_directory/."
         check_and_exit
-        rm -rf "$install_directory/$github_project-"*
+        rm -rf "$install_directory/$local_project-"*
         check_and_exit
     else
         zip_ball="https://github.com/$github_path/zipball/$github_ref"