diff --git a/script/create-dist.py b/script/create-dist.py
index 5d52234b5681..928430e22da1 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -80,6 +80,8 @@ def main():
   rm_rf(DIST_DIR)
   os.makedirs(DIST_DIR)
 
+  target_arch = get_target_arch()
+
   force_build()
   create_symbols()
   copy_binaries()
@@ -89,11 +91,13 @@ def main():
 
   if PLATFORM == 'linux':
     strip_binaries()
-    copy_system_libraries()
+    if target_arch != 'arm':
+      copy_system_libraries()
 
   create_version()
   create_dist_zip()
-  create_chrome_binary_zip('chromedriver', get_chromedriver_version())
+  if target_arch != 'arm':
+    create_chrome_binary_zip('chromedriver', get_chromedriver_version())
   create_chrome_binary_zip('mksnapshot', ATOM_SHELL_VERSION)
   create_symbols_zip()
 
diff --git a/script/upload.py b/script/upload.py
index 931eb92f7e06..03fbd33c6b9b 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -15,7 +15,6 @@ from lib.github import GitHub
 
 ATOM_SHELL_REPO = 'atom/electron'
 ATOM_SHELL_VERSION = get_atom_shell_version()
-CHROMEDRIVER_VERSION = get_chromedriver_version()
 
 PROJECT_NAME = atom_gyp()['project_name%']
 PRODUCT_NAME = atom_gyp()['product_name%']
@@ -31,9 +30,6 @@ SYMBOLS_NAME = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME,
                                                     ATOM_SHELL_VERSION,
                                                     PLATFORM,
                                                     get_target_arch())
-CHROMEDRIVER_NAME = 'chromedriver-{0}-{1}-{2}.zip'.format(CHROMEDRIVER_VERSION,
-                                                          PLATFORM,
-                                                          get_target_arch())
 MKSNAPSHOT_NAME = 'mksnapshot-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION,
                                                       PLATFORM,
                                                       get_target_arch())
@@ -79,11 +75,15 @@ def main():
 
   # Upload chromedriver and mksnapshot for minor version update.
   if parse_version(args.version)[2] == '0':
-    upload_atom_shell(github, release_id,
-                      os.path.join(DIST_DIR, CHROMEDRIVER_NAME))
     upload_atom_shell(github, release_id,
                       os.path.join(DIST_DIR, MKSNAPSHOT_NAME))
 
+    if get_target_arch() != 'arm':
+      chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format(
+          get_chromedriver_version(), PLATFORM, get_target_arch())
+      upload_atom_shell(github, release_id,
+                        os.path.join(DIST_DIR, chromedriver))
+
   if PLATFORM == 'win32':
     # Upload node headers.
     execute([sys.executable,