diff --git a/.travis.yml b/.travis.yml
index ee2cf22a..be2cdda8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ env:
   global:
     - secure: ffCiAwT3mkRQ57yTyTKUV4nRsnsdDuTSXbwSFpNg/AXLn6KTt35wpp2kbKTUhU4fUikpoKh30+TMiXp1vhc7XSUo/E06JyjccRIE6oXas07NcYhYd0JRlPPWKZU8q33jvFYFB7U63vY/65tGk+wlrWm7NFyqqXwGMuysd7XT1tE=
 script:
-  - (cd phf && cargo test)
-  - rustdoc -L phf/target/test -L phf/target/test/deps phf/src/lib.rs
-  - rustdoc phf_mac/src/lib.rs
+  - (cd phf && cargo test && cargo doc)
+  - (cd phf_mac && cargo doc)
 after_script:
+  - cp -r phf/target/doc .
+  - cp -r phf_mac/target/doc .
   - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh
diff --git a/phf/src/lib.rs b/phf/src/lib.rs
index 0706875c..c126176a 100644
--- a/phf/src/lib.rs
+++ b/phf/src/lib.rs
@@ -5,7 +5,6 @@
 #![doc(html_root_url="http://www.rust-ci.org/sfackler")]
 #![warn(missing_doc)]
 #![feature(macro_rules)]
-#![crate_name="phf"]
 
 use std::fmt;
 use std::iter;
diff --git a/phf_mac/src/lib.rs b/phf_mac/src/lib.rs
index 9cd52f79..aec4aea7 100644
--- a/phf_mac/src/lib.rs
+++ b/phf_mac/src/lib.rs
@@ -3,7 +3,6 @@
 //! See the documentation for the `phf` crate for more details.
 #![doc(html_root_url="http://sfackler.github.io/rust-phf/doc")]
 #![feature(plugin_registrar, quote, default_type_params, macro_rules)]
-#![crate_name="phf_mac"]
 
 extern crate rand;
 extern crate syntax;