diff --git a/Makefile.in b/Makefile.in
index ab4f0bb6..d67ab039 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,11 +4,11 @@ RUSTFLAGS := -O --cfg ndebug
 INSTALL_DIR := %PREFIX%
 
 PHF_LIB := phf/src/lib.rs
-PHF := $(foreach file,$(shell $(RUSTC) --crate-file-name $(PHF_LIB)),$(BUILDDIR)/$(file))
+PHF := $(foreach file,$(shell $(RUSTC) --print-file-name $(PHF_LIB)),$(BUILDDIR)/$(file))
 PHF_MAC_LIB := phf_mac/src/lib.rs
-PHF_MAC := $(BUILDDIR)/$(shell $(RUSTC) --crate-file-name $(PHF_MAC_LIB))
+PHF_MAC := $(BUILDDIR)/$(shell $(RUSTC) --print-file-name $(PHF_MAC_LIB))
 PHF_TEST_MAIN := phf/src/test.rs
-PHF_TEST := $(BUILDDIR)/$(shell $(RUSTC) --crate-file-name $(PHF_TEST_MAIN))
+PHF_TEST := $(BUILDDIR)/$(shell $(RUSTC) --print-file-name $(PHF_TEST_MAIN))
 
 all: $(PHF) $(PHF_MAC)
 
diff --git a/phf/src/lib.rs b/phf/src/lib.rs
index 0c23ad0d..173377ec 100644
--- a/phf/src/lib.rs
+++ b/phf/src/lib.rs
@@ -1,5 +1,5 @@
 //! Compile time optimized maps
-#![crate_id="github.com/sfackler/rust-phf/phf"]
+#![crate_name="phf"]
 #![doc(html_root_url="http://www.rust-ci.org/sfackler")]
 #![crate_type="rlib"]
 #![crate_type="dylib"]
diff --git a/phf_mac/src/lib.rs b/phf_mac/src/lib.rs
index 12a36ab1..a3f0c6ed 100644
--- a/phf_mac/src/lib.rs
+++ b/phf_mac/src/lib.rs
@@ -1,7 +1,7 @@
 //! Compiler plugin for Rust-PHF
 //!
 //! See the documentation for the `phf` crate for more details.
-#![crate_id="github.com/sfackler/rust-phf/phf_mac"]
+#![crate_name="phf_mac"]
 #![crate_type="dylib"]
 #![doc(html_root_url="http://sfackler.github.io/rust-phf/doc")]
 #![feature(plugin_registrar, quote)]