diff --git a/mk/snap.mk b/mk/snap.mk
index 55b27874993..6dc468c50d4 100644
--- a/mk/snap.mk
+++ b/mk/snap.mk
@@ -1,13 +1,16 @@
 
 snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB) \
-	stage1/lib/libstd.rlib
+	stage1/lib/libstd.rlib stage1/lib/$(CFG_RUNTIME) \
+	stage1/lib/$(CFG_RUSTLLVM)
 	$(S)src/etc/make-snapshot.py stage1
 
 snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB) \
-	stage2/lib/libstd.rlib
+	stage2/lib/libstd.rlib stage2/lib/$(CFG_RUNTIME) \
+	stage2/lib/$(CFG_RUSTLLVM)
 	$(S)src/etc/make-snapshot.py stage2
 
 snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB) \
-	stage3/lib/libstd.rlib
+	stage3/lib/libstd.rlib stage3/lib/$(CFG_RUNTIME) \
+	stage3/lib/$(CFG_RUSTLLVM)
 	$(S)src/etc/make-snapshot.py stage3
 
diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index 98e480defda..aa64a4fb49a 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 a1ee4883a2b..2e566359906 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -15,12 +15,22 @@ 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 = {
+# FIXME: This is transitional for moving rt/rustllvm into the snapshot
+old_snapshot_files = {
     "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib" ],
     "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib" ],
     "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib" ]
     }
 
+snapshot_files = {
+    "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
+              "lib/librustrt.so", "lib/librustllvm.so"],
+    "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
+              "lib/librustrt.dylib", "lib/librustllvm.dylib"],
+    "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib",
+              "lib/rustrt.dll", "lib/rustllvm.dll"]
+    }
+
 def parse_line(n, line):
   global snapshotfile