diff --git a/.gitignore b/.gitignore
index dee2ac3e9..6eec21c2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ debug.log
 /tags
 /atom-shell/
 /electron/
+/out/
 docs/output
 docs/includes
 spec/fixtures/evil-files/
diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index ebaf1642d..948e2a911 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -36,7 +36,7 @@ module.exports = (grunt) ->
   # Options
   installDir = grunt.option('install-dir')
   buildDir = grunt.option('build-dir')
-  buildDir ?= path.join(os.tmpdir(), 'atom-build')
+  buildDir ?= 'out'
   buildDir = path.resolve(buildDir)
 
   channel = grunt.option('channel')
diff --git a/script/clean b/script/clean
index 8b5fdf414..fd0aa5bfa 100755
--- a/script/clean
+++ b/script/clean
@@ -21,6 +21,7 @@ var commands = [
   [__dirname, '..', 'apm', 'node_modules'],
   [__dirname, '..', 'atom-shell'],
   [__dirname, '..', 'electron'],
+  [__dirname, '..', 'out'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],
   [home, '.atom', '.apm'],