diff --git a/Makefile.in b/Makefile.in
index baae56c4f4093..4908ea65cf220 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,17 +239,17 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
 # Standard library variables
 ######################################################################
 
-STDLIB_CRATE := $(S)src/libstd/core.rc
+STDLIB_CRATE := $(S)src/libstd/std.rs
 STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,        \
-                                           core.rc *.rs */*.rs */*/*rs */*/*/*rs))
+                                           *.rs */*.rs */*/*rs */*/*/*rs))
 
 ######################################################################
 # Extra library variables
 ######################################################################
 
-EXTRALIB_CRATE := $(S)src/libextra/std.rc
+EXTRALIB_CRATE := $(S)src/libextra/extra.rs
 EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/,          \
-                                          std.rc *.rs */*.rs))
+                                          *.rs */*.rs))
 
 ######################################################################
 # rustc crate variables
diff --git a/src/libextra/std.rc b/src/libextra/extra.rs
similarity index 100%
rename from src/libextra/std.rc
rename to src/libextra/extra.rs
diff --git a/src/libstd/core.rc b/src/libstd/std.rs
similarity index 100%
rename from src/libstd/core.rc
rename to src/libstd/std.rs