diff --git a/mk/snap.mk b/mk/snap.mk
index f13ca3f6ca0..a8346b5f2c8 100644
--- a/mk/snap.mk
+++ b/mk/snap.mk
@@ -1,15 +1,13 @@
 
-snap-stage1: stage1/rustc$(X) stage1/lib/$(CFG_RUNTIME) \
-	stage1/$(CFG_RUSTLLVM) stage1/lib/main.o
+snap-stage1: stage1/bin/rustc$(X) stage1/lib/$(CFG_RUNTIME) \
+	stage1/lib/$(CFG_RUSTLLVM) stage1/lib/$(CFG_STDLIB)
 	$(S)src/etc/make-snapshot.py stage1
 
-snap-stage2: stage2/rustc$(X) stage2/lib/$(CFG_STDLIB) \
-	stage2/lib/libstd.rlib stage2/lib/$(CFG_RUNTIME) \
-	stage2/$(CFG_RUSTLLVM) stage2/lib/main.o
+snap-stage2: stage2/bin/rustc$(X) stage2/lib/$(CFG_RUNTIME) \
+	stage2/lib/$(CFG_RUSTLLVM) stage2/lib/$(CFG_STDLIB)
 	$(S)src/etc/make-snapshot.py stage2
 
-snap-stage3: stage3/rustc$(X) stage3/lib/$(CFG_STDLIB) \
-	stage3/lib/libstd.rlib stage3/lib/$(CFG_RUNTIME) \
-	stage3/$(CFG_RUSTLLVM) stage3/lib/main.o
+snap-stage3: stage3/bin/rustc$(X) stage3/lib/$(CFG_RUNTIME) \
+	stage3/lib/$(CFG_RUSTLLVM) stage3/lib/$(CFG_STDLIB)
 	$(S)src/etc/make-snapshot.py stage3
 
diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index e790038ade8..8f718be4ff0 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -26,12 +26,12 @@ old_snapshot_files = {
     }
 
 snapshot_files = {
-    "linux": ["rustc", "lib/libstd.so", "lib/main.o",
-              "librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
-    "macos": ["rustc", "lib/libstd.dylib", "lib/main.o",
-              "librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"],
-    "winnt": ["rustc.exe", "lib/std.dll", "lib/main.o",
-              "rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
+    "linux": ["bin/rustc", "lib/libstd.so",
+              "lib/librustrt.so", "lib/librustllvm.so"],
+    "macos": ["bin/rustc", "lib/libstd.dylib",
+              "lib/librustrt.dylib", "lib/librustllvm.dylib"],
+    "winnt": ["bin/rustc.exe", "lib/std.dll",
+              "lib/rustrt.dll", "lib/rustllvm.dll"]
     }
 
 def parse_line(n, line):