diff --git a/.gitmodules b/.gitmodules
index 5517d4434f38..c6e53ed39a69 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "vendor/requests"]
 	path = vendor/requests
 	url = https://github.com/kennethreitz/requests
+[submodule "vendor/boto"]
+	path = vendor/boto
+	url = https://github.com/boto/boto.git
diff --git a/script/bootstrap.py b/script/bootstrap.py
index 94a566224c36..293d3dc2dd10 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -37,7 +37,7 @@ def main():
     update_clang()
 
   update_submodules()
-  setup_requests()
+  setup_python_libs()
   update_node_modules('.')
   bootstrap_brightray(args.dev, args.url, args.target_arch)
 
@@ -85,9 +85,10 @@ def update_submodules():
   execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
 
 
-def setup_requests():
-  with scoped_cwd(os.path.join(VENDOR_DIR, 'requests')):
-    execute_stdout([sys.executable, 'setup.py', 'build'])
+def setup_python_libs():
+  for lib in ('requests', 'boto'):
+    with scoped_cwd(os.path.join(VENDOR_DIR, lib)):
+      execute_stdout([sys.executable, 'setup.py', 'build'])
 
 
 def bootstrap_brightray(is_dev, url, target_arch):
diff --git a/script/lib/util.py b/script/lib/util.py
index d7559ff7f718..01112947da95 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -209,8 +209,18 @@ def parse_version(version):
 
 
 def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
+  env = os.environ.copy()
+  BOTO_DIR = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'vendor',
+                                          'boto'))
+  env['PYTHONPATH'] = os.path.pathsep.join([
+    env.get('PYTHONPATH', ''),
+    os.path.join(BOTO_DIR, 'build', 'lib'),
+    os.path.join(BOTO_DIR, 'build', 'lib.linux-x86_64-2.7')])
+
+  boto = os.path.join(BOTO_DIR, 'bin', 's3put')
   args = [
-    's3put',
+    sys.executable,
+    boto,
     '--bucket', bucket,
     '--access_key', access_key,
     '--secret_key', secret_key,
@@ -219,4 +229,4 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
     '--grant', 'public-read'
   ] + files
 
-  execute(args)
+  execute(args, env)
diff --git a/vendor/boto b/vendor/boto
new file mode 160000
index 000000000000..f7574aa6cc2c
--- /dev/null
+++ b/vendor/boto
@@ -0,0 +1 @@
+Subproject commit f7574aa6cc2c819430c1f05e9a1a1a666ef8169b