diff --git a/srcpkgs/rust/patches/cargo-hack.patch b/srcpkgs/rust/patches/cargo-hack.patch
new file mode 100644
index 0000000000..9f8f71090d
--- /dev/null
+++ b/srcpkgs/rust/patches/cargo-hack.patch
@@ -0,0 +1,11 @@
+--- rustc-1.18.0-src/src/bootstrap/lib.rs.orig
++++ rustc-1.18.0-src/src/bootstrap/lib.rs
+@@ -220,7 +220,7 @@
+         };
+         let cargo = match config.cargo {
+             Some(ref s) => PathBuf::from(s),
+-            None => stage0_root.join(exe("cargo", &config.build)),
++            None => PathBuf::from("cargo")
+         };
+         let local_rebuild = config.local_rebuild;
+ 
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index adeb1056fa..611c3e611b 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,6 +1,6 @@
 # Template file for 'rust'
 pkgname=rust
-version=1.17.0
+version=1.18.0
 revision=1
 # NB. if you push any(!) new version, don't forget to put a build
 # output of musl to https://repo.voidlinux.eu/distfiles/
@@ -17,40 +17,40 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="http://www.rust-lang.org/"
 license="MIT, Apache-2.0"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87
+checksum=d2dc36e99b9e2269488b2bcddde43c234e6bde03edf70cba82a027ff49c36111
 
 case "$XBPS_MACHINE" in
 x86_64-musl)
 	hostmakedepends+=" libcurl libgit2"
 	distfiles+="
-	 https://repo.voidlinux.eu/distfiles/rustc-1.16.0-x86_64-unknown-linux-musl.tar.gz
-	 https://repo.voidlinux.eu/distfiles/rust-std-1.16.0-x86_64-unknown-linux-musl.tar.gz
+	 https://repo.voidlinux.eu/distfiles/rustc-1.17.0-x86_64-unknown-linux-musl.tar.gz
+	 https://repo.voidlinux.eu/distfiles/rust-std-1.17.0-x86_64-unknown-linux-musl.tar.gz
 	 https://repo.voidlinux.eu/distfiles/cargo-0.17.0-x86_64-unknown-linux-musl.tar.gz"
 	checksum+="
-	 9ffc7e168bd6fcdb912535506efb15b06d85dc4bed79c11d5f2651978cf6116b
-	 8ccb1ba07a1ccd146f29eb0b3f3d6feffed55b987d524c8955f6c3f50c587ae5
+	 b9202eb468568c528e3e817c7f230e12215030c6cefaffccd7fc22a10356cc38
+	 f1c6b1a6ca28a4e2018457afe3ff51404bac37881639ad683cbe8f6d9f0632a2
 	 0150d5b249fa66a5d2515e6beb27aa6dfb25301bb50522fab7c2445bb7ecdd09"
 	;;
 x86_64)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://static.rust-lang.org/dist/2017-03-11/rustc-1.16.0-x86_64-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/2017-03-11/rust-std-1.16.0-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-04-27/rustc-1.17.0-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-04-27/rust-std-1.17.0-x86_64-unknown-linux-gnu.tar.gz
 	 https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
 	checksum+="
-	 b1dc3f754eeaf03891a3bd398c8c5024404c0078a334e5d8795e9dc419d147b3
-	 cbd43de2ab819d3332ce309046f3b5d715c1b47877a237791b99c96b1fe0d555
+	 3eebd92512040baf3c0974c3ce61859646d8cf422cc515d724d857577da0dbd5
+	 2902bb0da78208f441f1d983aeafcad01ea653d2e062a8192892868e2b41130d
 	 d9e69d2b87dc0cf7fafe0e0eb64f82fe3414ef14fcb27f5eeff34df860e459d9"
 	;;
 i686)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://static.rust-lang.org/dist/2017-03-11/rustc-1.16.0-i686-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/2017-03-11/rust-std-1.16.0-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-04-27/rustc-1.17.0-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-04-27/rust-std-1.17.0-i686-unknown-linux-gnu.tar.gz
 	 https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
 	checksum+="
-	 f8e0f96c17d8345be7818035e9bcae8e809a1b13635fe9a322df4a82d6dd1275
-	 5a74e3661f4b300bf73353389acab097f3e07813b0f3073007830a549656054a
+	 9d3e3ff343f22b5288676b40d6749ebeabea863fa9e6009fbc5a018ede83c57c
+	 3dbaa44a07b14e5af05633c5f1a7d6b0538c6f8fa404ee6d3f85714d4f2bf39b
 	 863a4f92bbeec76257403fd571a90b90bd759ec8bcaddb7517fb89d40959e9e5"
 	;;
 esac
@@ -113,6 +113,8 @@ do_configure() {
 		--disable-rpath
 		--enable-ccache
 		--llvm-root=/usr
+		--enable-local-rust
+		--local-rust-root=$wrksrc/stage0
 	"
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)