diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9a675bbfaaa..9bf55c777db 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.17.0
-revision=3
+version=0.18.0
+revision=1
 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf
 patch_args="-Np1"
 build_style=gnu-configure
@@ -10,33 +10,33 @@ hostmakedepends="rust python curl cmake pkg-config"
 makedepends="libcurl-devel http-parser-devel libgit2-devel"
 depends="rust"
 short_desc="Rust package manager"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz
  https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz"
-checksum="fc689ca7a09f1e6a1c31e69f0e2616a93576a68e0e1d7f0ae4c0d3301ff21ff8
+checksum="19b5c142c194fc2f940d93b4679850980ed077db0ff7c558122c7ef865e24983
  dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae"
 nocross=yes
 
 case "$XBPS_MACHINE" in
 x86_64-musl)
 	distfiles+="
-	 https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz"
+	 https://repo.voidlinux.eu/distfiles/cargo-0.17.0-x86_64-unknown-linux-musl.tar.gz"
 	checksum+="
-	 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9"
+	 0150d5b249fa66a5d2515e6beb27aa6dfb25301bb50522fab7c2445bb7ecdd09"
 	;;
 x86_64)
 	distfiles+="
-	 https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
+	 https://static.rust-lang.org/dist/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz"
 	checksum+="
-	 55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2"
+	 3601e95c968850230b137b849ff08a507e50d77ab584c779143a100f1843d8dd"
 	;;
 i686)
 	distfiles+="
-	 https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
+	 https://static.rust-lang.org/dist/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz"
 	checksum+="
-	 b2a1c4c33fb9274771c8d830cd8ac07f7ae96af341fa30399d6929ffd6c8b425"
+	 fbc5a0614345dfb2b41e133bd821257906a839753a9aa4c4590cc9d658164e58"
 	;;
 esac
 
@@ -45,8 +45,7 @@ post_extract() {
 	mv ../rust-installer-${_githash_installer} src/rust-installer
 	sed -i 's,/etc/bash_completion.d,/share/bash-completion/completions,g' Makefile.in
 	mkdir -p target/snapshot
-	cp ../cargo-nightly*/cargo/bin/cargo cargo
-	rm Cargo.lock  # unlock rust-openssl 0.9.4
+	cp ../cargo-*/cargo/bin/cargo cargo
 }
 pre_configure() {
 	configure_args+=" --host=${XBPS_TRIPLET/-pc-/-unknown-} --build=${XBPS_TRIPLET/-pc-/-unknown-} --cargo=$wrksrc/cargo"