diff --git a/.travis.yml b/.travis.yml
index d4224cd6..ea411a04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,11 @@ env:
   global:
     - secure: GwyxF8F9NKc9M2YypZZMGyIolTf7lDfeKnhhGre28HuzE4e9oIB7dUGjqYrx6uQ/ei++rpd+pjhTFilnX5inS/E+7R7DRvdX00JERWPF+qgiWpxPAoT/iI2RQ+7PKiLcwrzdzQIhSfIse/FikdpkeSY0FJG9/vu/HXNzFxDBPW0=
 language: c
+before_install:
+  - yes | sudo add-apt-repository ppa:cmrx64/cargo
 install:
+  - sudo apt-get update
+  - sudo apt-get install cargo
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib 
   - curl -O http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
   - tar xfz rust-nightly-x86_64-unknown-linux-gnu.tar.gz
diff --git a/Makefile b/Makefile
index b670ff54..59532af0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,11 @@
 tmp=_git_distcheck
-nalgebra_lib_path=lib
 nalgebra_doc_path=doc
+
 all:
-	mkdir -p $(nalgebra_lib_path)
-	rustc src/lib.rs --out-dir $(nalgebra_lib_path) --crate-type dylib --crate-type rlib --opt-level 3
+	cargo build --release
 
 test:
-	mkdir -p $(nalgebra_lib_path)
-	rustc --test src/lib.rs --opt-level 3 -o test~ && ./test~
-	rm test~
-	rustdoc --test -L lib src/lib.rs
+	cargo test
 
 bench:
 	rustc --test src/lib.rs --opt-level 3 -o bench~ && ./bench~ --bench
diff --git a/src/lib.rs b/src/lib.rs
index 47ed6b36..f2a857ca 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -96,7 +96,6 @@ Feel free to add your project to this list if you happen to use **nalgebra**!
 * [frog](https://github.com/natal/frog): a machine learning library.
 */
 
-#![crate_name = "nalgebra"]
 #![deny(non_camel_case_types)]
 #![deny(unnecessary_parens)]
 #![deny(non_uppercase_statics)]