diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -5,5 +5,6 @@
 libgcc_s.so.1
 libm.so.6
 libpthread.so.0
+librt.so.1
 libssl.so.1.0.0
 libz.so.1
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : cargo
-version    : 0.17.0
-release    : 6
+version    : 0.21.1
+release    : 7
 source     :
-    - git|https://github.com/rust-lang/cargo.git : 0.17.0
+    - https://github.com/rust-lang/cargo/archive/0.21.1/cargo-0.21.1.tar.gz : f2464d3cb3e431e45191b6f70e415c320d227ef3c3d134cea4e86357c0c72a33
 license    :
     - Apache-2.0
     - MIT
@@ -16,22 +16,23 @@
     The Rust package manager
 networking : yes
 builddeps  :
-    - rust
-    - cargo
     - pkgconfig(libssl)
+    - cargo
+    - git       # check
+    - rust
 rundeps    :
     - rust
-setup      : |
-    ./configure --prefix=/usr \
-                --libdir=%libdir% \
-                --sysconfdir=/etc \
-                --datadir=/usr/share \
-                --enable-optimize \
-                --release-channel=stable
 build      : |
-    %make
+    cargo build --release
 install    : |
-    %make_install
-    install -d -D -m 00755 $installdir/usr/share/bash-completion
-    mv $installdir/usr/etc/bash_completion.d $installdir/usr/share/bash-completion/completions.d
-    rm -rfv $installdir/usr/etc
+    cargo install --root=$installdir/usr
+
+    mkdir -p $installdir/usr/share/bash-completion/completions.d
+    mkdir -p $installdir/usr/share/zsh/site-functions
+    mkdir -p $installdir/usr/share/man/man1
+
+    install -m 00644 src/etc/cargo.bashcomp.sh $installdir/usr/share/bash-completion/completions.d
+    install -Dm 00644 src/etc/_cargo $installdir/usr/share/zsh/site-functions/_cargo
+    install -m 00644 src/etc/man/cargo*.1 -t $installdir/usr/share/man/man1
+check      : |
+    CFG_DISABLE_CROSS_TESTS=1 cargo test --no-fail-fast
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>cargo</Name>
         <Packager>
-            <Name>Nathan Caldwell</Name>
-            <Email>saintdev@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>Apache-2.0</License>
         <License>MIT</License>
@@ -24,25 +24,20 @@
 </Description>
         <PartOf>programming</PartOf>
         <Files>
+            <Path fileType="data">/usr/.crates.toml</Path>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/rustlib/components</Path>
-            <Path fileType="library">/usr/lib/rustlib/install.log</Path>
-            <Path fileType="library">/usr/lib/rustlib/manifest-cargo</Path>
-            <Path fileType="library">/usr/lib/rustlib/rust-installer-version</Path>
-            <Path fileType="library">/usr/lib/rustlib/uninstall.sh</Path>
-            <Path fileType="data">/usr/share/bash-completion/completions.d/cargo</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/share/bash-completion/completions.d/cargo.bashcomp.sh</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="data">/usr/share/zsh/site-functions/_cargo</Path>
         </Files>
     </Package>
     <History>
-        <Update release="6">
-            <Date>2017-03-17</Date>
-            <Version>0.17.0</Version>
+        <Update release="7">
+            <Date>2017-09-28</Date>
+            <Version>0.21.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Nathan Caldwell</Name>
-            <Email>saintdev@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file