diff --git a/Makefile.in b/Makefile.in
index baae56c4f40..fa6c7806581 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,29 +239,29 @@ $(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
 ######################################################################
 
-COMPILER_CRATE := $(S)src/librustc/rustc.rc
+COMPILER_CRATE := $(S)src/librustc/rustc.rs
 COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/librustc/,      \
-                           rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs))
+                           *.rs */*.rs */*/*.rs */*/*/*.rs))
 
-LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rc
+LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rs
 LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
-                            syntax.rc *.rs */*.rs */*/*.rs))
+                           *.rs */*.rs */*/*.rs))
 
 DRIVER_CRATE := $(S)src/driver/driver.rs
 
diff --git a/mk/tools.mk b/mk/tools.mk
index 8319d8d4e48..7b50441b3c7 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -12,23 +12,23 @@
 # and host architectures
 
 # The test runner that runs the cfail/rfail/rpass and bxench tests
-COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rc
-COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*rs)
+COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rs
+COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*.rs)
 
 # Rustpkg, the package manager and build system
-RUSTPKG_LIB := $(S)src/librustpkg/rustpkg.rc
-RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*rs)
+RUSTPKG_LIB := $(S)src/librustpkg/rustpkg.rs
+RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs)
 
 # Rustdoc, the documentation tool
-RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rc
+RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rs
 RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs)
 
 # Rusti, the JIT REPL
-RUSTI_LIB := $(S)src/librusti/rusti.rc
+RUSTI_LIB := $(S)src/librusti/rusti.rs
 RUSTI_INPUTS := $(wildcard $(S)src/librusti/*.rs)
 
 # Rust, the convenience tool
-RUST_LIB := $(S)src/librust/rust.rc
+RUST_LIB := $(S)src/librust/rust.rs
 RUST_INPUTS := $(wildcard $(S)src/librust/*.rs)
 
 # FIXME: These are only built for the host arch. Eventually we'll
diff --git a/src/compiletest/compiletest.rc b/src/compiletest/compiletest.rs
similarity index 100%
rename from src/compiletest/compiletest.rc
rename to src/compiletest/compiletest.rs
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/librust/rust.rc b/src/librust/rust.rs
similarity index 100%
rename from src/librust/rust.rc
rename to src/librust/rust.rs
diff --git a/src/librustc/rustc.rc b/src/librustc/rustc.rs
similarity index 100%
rename from src/librustc/rustc.rc
rename to src/librustc/rustc.rs
diff --git a/src/librustdoc/rustdoc.rc b/src/librustdoc/rustdoc.rs
similarity index 100%
rename from src/librustdoc/rustdoc.rc
rename to src/librustdoc/rustdoc.rs
diff --git a/src/librusti/rusti.rc b/src/librusti/rusti.rs
similarity index 100%
rename from src/librusti/rusti.rc
rename to src/librusti/rusti.rs
diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rs
similarity index 100%
rename from src/librustpkg/rustpkg.rc
rename to src/librustpkg/rustpkg.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
diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rs
similarity index 100%
rename from src/libsyntax/syntax.rc
rename to src/libsyntax/syntax.rs