diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index 98e480defda1..aa64a4fb49a1 100755
--- a/src/etc/get-snapshot.py
+++ b/src/etc/get-snapshot.py
@@ -9,7 +9,7 @@ def unpack_snapshot(snap):
   print("opening snapshot " + dl_path)
   tar = tarfile.open(dl_path)
   kernel = get_kernel()
-  for name in snapshot_files[kernel]:
+  for name in old_snapshot_files[kernel]:
     p = "rust-stage0/" + name
     fp = os.path.join("stage0", name)
     print("extracting " + fp)
diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index 82d423ce2fdd..115466dd9475 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -15,7 +15,7 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots"
 download_dir_base = "dl"
 download_unpack_base = os.path.join(download_dir_base, "unpack")
 
-snapshot_files = {
+old_snapshot_files = {
     "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
               "lib/librustrt.so", "librustllvm.so", "intrinsics.bc"],
     "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
@@ -24,6 +24,15 @@ snapshot_files = {
               "lib/rustrt.dll", "rustllvm.dll", "intrinsics.bc"]
     }
 
+snapshot_files = {
+    "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
+              "lib/librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
+    "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
+              "lib/librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"],
+    "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib",
+              "lib/rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
+    }
+
 def parse_line(n, line):
   global snapshotfile