diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : cargo
-version    : 0.18.0
-release    : 7
+version    : 0.22.0
+release    : 8
 source     :
-    - git|https://github.com/rust-lang/cargo.git : 0.18.0
+    - https://github.com/rust-lang/cargo/archive/0.22.0.tar.gz : 6740e2f8d035a5a5246a12e84a141d37ad4c2b826355aff497e6f1fcfb637aef
 license    :
     - Apache-2.0
     - MIT
@@ -13,25 +13,27 @@
 component  : programming
 summary    : The Rust package manager
 description: |
-    The Rust package manager
+    Cargo is a tool that allows Rust projects to declare their various
+    dependencies and ensure that you'll always get a repeatable build.
 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
+    sh src/ci/dox.sh
 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
+    rm $installdir/usr/.crates.toml
+
+    install -Dm 00644 src/etc/cargo.bashcomp.sh $installdir/usr/share/bash-completion/completions.d/cargo.bashcomp.sh
+    install -Dm 00644 src/etc/_cargo $installdir/usr/share/zsh/site-functions/_cargo
+    install -Dm 00644 src/etc/man/cargo*.1 -t $installdir/usr/share/man/man1
+    install -dm 00755 $installdir/usr/share/doc/cargo/html
+    cp -a target/doc $installdir/usr/share/doc/cargo/html
+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>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>Apache-2.0</License>
         <License>MIT</License>
@@ -13,36 +13,33 @@
         <License>BSD-3-Clause</License>
         <PartOf>programming</PartOf>
         <Summary xml:lang="en">The Rust package manager</Summary>
-        <Description xml:lang="en">The Rust package manager
+        <Description xml:lang="en">Cargo is a tool that allows Rust projects to declare their various
+dependencies and ensure that you&apos;ll always get a repeatable build.
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>cargo</Name>
         <Summary xml:lang="en">The Rust package manager</Summary>
-        <Description xml:lang="en">The Rust package manager
+        <Description xml:lang="en">Cargo is a tool that allows Rust projects to declare their various
+dependencies and ensure that you&apos;ll always get a repeatable build.
 </Description>
         <PartOf>programming</PartOf>
         <Files>
             <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="data">/usr/share/bash-completion/completions.d/cargo.bashcomp.sh</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="data">/usr/share/zsh/site-functions/_cargo</Path>
         </Files>
     </Package>
     <History>
-        <Update release="7">
-            <Date>2017-10-04</Date>
-            <Version>0.18.0</Version>
+        <Update release="8">
+            <Date>2017-11-13</Date>
+            <Version>0.22.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file