diff --git a/script/install-sysroot.py b/script/install-sysroot.py
index 9909cc3e769a..58b4e7c74b99 100755
--- a/script/install-sysroot.py
+++ b/script/install-sysroot.py
@@ -85,7 +85,7 @@ def main(args):
 def InstallDefaultSysrootForArch(target_arch):
   if target_arch not in VALID_ARCHS:
     raise Error('Unknown architecture: %s' % target_arch)
-  if target_arch == 'arm64':
+  if target_arch in ['amd64', 'arm64', 'i386']:
     InstallSysroot('Jessie', target_arch)
   else:
     InstallSysroot('Wheezy', target_arch)
diff --git a/toolchain.gypi b/toolchain.gypi
index b5b87ca41743..b81a63dc3cfc 100644
--- a/toolchain.gypi
+++ b/toolchain.gypi
@@ -56,10 +56,10 @@
               'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot',
             }],
             ['target_arch=="ia32"', {
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
+              'sysroot%': '<(source_root)/vendor/debian_jessie_i386-sysroot',
             }],
             ['target_arch=="x64"', {
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
+              'sysroot%': '<(source_root)/vendor/debian_jessie_amd64-sysroot',
             }],
           ],
         },