diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index c54624002..fc177fe91 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -125,7 +125,7 @@ module.exports = (grunt) ->
   grunt.registerTask 'build', 'Build the application', ->
     rm SHELL_APP_DIR
     mkdir path.dirname(BUILD_DIR)
-    cp 'atom-shell/Atom.app', SHELL_APP_DIR
+    cp 'atom-shell', BUILD_DIR
 
     mkdir APP_DIR
 
diff --git a/script/create-atom b/script/create-atom
index 2f3f5b0c0..69c07710d 100755
--- a/script/create-atom
+++ b/script/create-atom
@@ -7,7 +7,7 @@ set -e
 
 cd "$(dirname "$0")/.."
 ./script/bootstrap
-./node_modules/.bin/grunt --build-dir="$BUILT_PRODUCTS_DIR build"
+./node_modules/.bin/grunt -v --build-dir="$BUILT_PRODUCTS_DIR bootstrap build"
 
 echo <<OUTPUT_FOR_CONSTRUCTICON
 TARGET_BUILD_DIR=$BUILT_PRODUCTS_DIR