diff --git a/mk/snap.mk b/mk/snap.mk
index ec3d145ef8a..55b27874993 100644
--- a/mk/snap.mk
+++ b/mk/snap.mk
@@ -1,10 +1,13 @@
 
-snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB)
+snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB) \
+	stage1/lib/libstd.rlib
 	$(S)src/etc/make-snapshot.py stage1
 
-snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB)
+snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB) \
+	stage2/lib/libstd.rlib
 	$(S)src/etc/make-snapshot.py stage2
 
-snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB)
+snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB) \
+	stage3/lib/libstd.rlib
 	$(S)src/etc/make-snapshot.py stage3
 
diff --git a/mk/stage1.mk b/mk/stage1.mk
index 575808ee1b9..5cf6f5ff6c7 100644
--- a/mk/stage1.mk
+++ b/mk/stage1.mk
@@ -4,6 +4,12 @@ stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE1) --lib -o $@ $<
 
+stage1/lib/libstd.rlib:  $(STDLIB_CRATE) $(STDLIB_INPUTS) \
+              stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
+              stage1/glue.o $(LREQ) $(MKFILES)
+	@$(call E, compile_and_link: $@)
+	$(STAGE1) --lib --static -o $@ $<
+
 stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
 	stage1/intrinsics.bc $(LREQ) $(MKFILES)
 	@$(call E, generate: $@)
diff --git a/mk/stage2.mk b/mk/stage2.mk
index 159933032f9..5a10d21c3c0 100644
--- a/mk/stage2.mk
+++ b/mk/stage2.mk
@@ -4,6 +4,12 @@ stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE2)  --lib -o $@ $<
 
+stage2/lib/libstd.rlib:  $(STDLIB_CRATE) $(STDLIB_INPUTS) \
+              stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
+              stage2/glue.o $(LREQ) $(MKFILES)
+	@$(call E, compile_and_link: $@)
+	$(STAGE2) --lib --static -o $@ $<
+
 stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
 	stage2/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)
diff --git a/mk/stage3.mk b/mk/stage3.mk
index 45843993887..0363a4245b5 100644
--- a/mk/stage3.mk
+++ b/mk/stage3.mk
@@ -4,6 +4,12 @@ stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE3)  --lib -o $@ $<
 
+stage3/lib/libstd.rlib:  $(STDLIB_CRATE) $(STDLIB_INPUTS) \
+              stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
+              stage3/glue.o $(LREQ) $(MKFILES)
+	@$(call E, compile_and_link: $@)
+	$(STAGE3) --lib --static -o $@ $<
+
 stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
 	 stage3/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)