diff --git a/win_toolchain/package_from_installed.py b/win_toolchain/package_from_installed.py
index 0c4ee2a25..22f52acbd 100644
--- a/win_toolchain/package_from_installed.py
+++ b/win_toolchain/package_from_installed.py
@@ -8,7 +8,7 @@ into a .zip file.
 
 It assumes default install locations for tools, in particular:
 - C:\Program Files (x86)\Microsoft Visual Studio 12.0\...
-- C:\Program Files (x86)\Windows Kits\8.0\...
+- C:\Program Files (x86)\Windows Kits\8.1\...
 
 1. Start from a fresh Win7 VM image.
 2. Install VS Pro. Deselect everything except MFC.
@@ -36,7 +36,7 @@ def BuildFileList():
 
   # Subset of VS corresponding roughly to VC.
   vs_path = r'C:\Program Files (x86)\Microsoft Visual Studio 12.0'
-  for path in [ 
+  for path in [
       'DIA SDK/bin',
       'DIA SDK/idl',
       'DIA SDK/include',
@@ -81,7 +81,7 @@ def BuildFileList():
             result.append((final_from, dest))
 
   # Just copy the whole SDK.
-  sdk_path = r'C:\Program Files (x86)\Windows Kits\8.0'
+  sdk_path = r'C:\Program Files (x86)\Windows Kits\8.1'
   for root, _, files in os.walk(sdk_path):
     for f in files:
       combined = os.path.normpath(os.path.join(root, f))
diff --git a/win_toolchain/toolchain2013.py b/win_toolchain/toolchain2013.py
index 288985ed2..3ca83b4a9 100755
--- a/win_toolchain/toolchain2013.py
+++ b/win_toolchain/toolchain2013.py
@@ -344,7 +344,7 @@ def CopyToFinalLocation(extracted_dirs, target_dir):
       'Program Files\\Microsoft Visual Studio 12.0\\DIA SDK\\': 'DIA SDK\\',
       'System64\\': 'sys64\\',
       'System\\': 'sys32\\',
-      'Windows Kits\\8.0\\': 'win8sdk\\',
+      'Windows Kits\\8.1\\': 'win8sdk\\',
       'WinDDK\\7600.16385.win7_wdk.100208-1538\\': 'wdk\\',
   }
   matches = []
@@ -398,7 +398,7 @@ def GenerateSetEnvCmd(target_dir, pro):
       f.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;'
                 '%~dp0..\\..\\VC\\bin;%PATH%\n')
     f.write('set LIB=%~dp0..\\..\\VC\\lib;'
-               '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x86;'
+               '%~dp0..\\..\\win8sdk\\Lib\\winv6.3\\um\\x86;'
                '%~dp0..\\..\\VC\\atlmfc\\lib\n'
             'goto :EOF\n')
 
@@ -420,7 +420,7 @@ def GenerateSetEnvCmd(target_dir, pro):
                  '%~dp0..\\..\\VC\\bin\\amd64;'
                  '%PATH%\n')
     f.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;'
-               '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x64;'
+               '%~dp0..\\..\\win8sdk\\Lib\\winv6.3\\um\\x64;'
                '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n')