diff --git a/script/cibuild b/script/cibuild
index 70a17237ca6..2c1e7e70304 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -57,14 +57,21 @@ def main():
   npm = 'npm.cmd' if sys.platform == 'win32' else 'npm'
   execute([npm, 'install', 'npm@2.12.1'])
 
-  run_script('bootstrap.py', ['--dev', '--target_arch=' + target_arch])
+  is_release = os.environ.has_key('ELECTRON_RELEASE')
+  args = ['--target_arch=' + target_arch]
+  if not is_release:
+    args += ['--dev']
+  run_script('bootstrap.py', args)
 
   run_script('cpplint.py')
   if sys.platform != 'win32':
     run_script('pylint.py')
   run_script('coffeelint.py')
-  run_script('build.py', ['-c', 'Debug'])
-  if target_arch == 'x64':
+  if is_release:
+    run_script('build.py', ['-c', 'R'])
+    run_script('create-dist.py')
+  elif target_arch == 'x64':
+    run_script('build.py', ['-c', 'D'])
     run_script('test.py', ['--ci'])