diff --git a/script/build.py b/script/build.py
index edce9e6cd..ce04c8621 100755
--- a/script/build.py
+++ b/script/build.py
@@ -20,7 +20,7 @@ def main():
   args = parse_args()
   for config in args.configuration:
     build_path = os.path.join('out', config)
-    subprocess.call([ninja, '-C', build_path])
+    subprocess.call([ninja, '-C', build_path, args.target])
 
 
 def parse_args():
@@ -30,6 +30,10 @@ def parse_args():
                       nargs='+',
                       default=CONFIGURATIONS,
                       required=False)
+  parser.add_argument('-t', '--target',
+                      help='Build specified target',
+                      default='atom',
+                      required=False)
   return parser.parse_args()
 
 
diff --git a/script/upload.py b/script/upload.py
index 7ff408c04..fef3663e9 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -64,12 +64,17 @@ def dist_newer_than_head():
 def upload(bucket, access_key, secret_key, version=ATOM_SHELL_VRESION):
   os.chdir(DIST_DIR)
 
-  # s3put(bucket, access_key, secret_key, DIST_DIR,
-  #       'atom-shell/{0}'.format(version), [DIST_NAME])
+  s3put(bucket, access_key, secret_key, DIST_DIR,
+        'atom-shell/{0}'.format(version), [DIST_NAME])
   s3put(bucket, access_key, secret_key, DIST_DIR,
         'atom-shell/dist/{0}'.format(NODE_VERSION), glob.glob('node-*.tar.gz'))
 
   if TARGET_PLATFORM == 'win32':
+    # Generate the node.lib.
+    build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
+    subprocess.check_call([sys.executable, build, '-c', 'Release',
+                          '-t', 'generate_node_lib'])
+
     out_dir = os.path.join(SOURCE_ROOT, 'out', 'Release')
     node_lib = os.path.join(out_dir, 'node.lib')
     s3put(bucket, access_key, secret_key, out_dir,