diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 402aa0c37ee..1e0a024ef2d 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,6 +1,6 @@
 # Template file for 'rust'
 pkgname=rust
-version=1.21.0
+version=1.22.1
 revision=1
 _date=2017-10-28
 # NB. if you push any(!) new version, don't forget to put a build
@@ -12,46 +12,46 @@ build_style=configure
 make_build_args="dist VERBOSE=1"
 only_for_archs="i686 x86_64 x86_64-musl"
 hostmakedepends="cmake curl pkg-config python"
-makedepends="libffi-devel llvm ncurses-devel zlib-devel"
+makedepends="libffi-devel llvm3.9 ncurses-devel zlib-devel"
 short_desc="Safe, concurrent, practical systems language"
 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=1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa
+checksum=8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3
 
 case "$XBPS_MACHINE" in
 x86_64-musl)
 	hostmakedepends+=" libcurl libgit2"
 	distfiles+="
-	 https://repo.voidlinux.eu/distfiles/rustc-1.20.0-x86_64-unknown-linux-musl.tar.gz
-	 https://repo.voidlinux.eu/distfiles/rust-std-1.20.0-x86_64-unknown-linux-musl.tar.gz
+	 https://repo.voidlinux.eu/distfiles/rustc-1.21.0-x86_64-unknown-linux-musl.tar.gz
+	 https://repo.voidlinux.eu/distfiles/rust-std-1.21.0-x86_64-unknown-linux-musl.tar.gz
 	 https://repo.voidlinux.eu/distfiles/cargo-0.18.0-x86_64-unknown-linux-musl.tar.gz"
 	checksum+="
-	 34b84dc375ef8fb9261762e548b49c4e4c652b5cf3696e6a41a110512c3f2471
-	 a5b14cf320e3ead97b2afdd9b5df21fa05515ff5d52d19fc7691b377ad6cc968
+	 b9dc8de877a5b90c798b7b8e4ff79cecf775f0edbddfe9e5b797e05fe478b533
+	 eab6ab127f02190253c9d9e49ae9d0548b1f72bf885488a5d2f30e72c3048c1b
 	 28f2ee839f14f8b3edf3f4e4cc8600ac99ea50905ee8fb91116bba676728c2e9"
 	;;
 x86_64)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://static.rust-lang.org/dist/2017-08-31/rustc-1.20.0-x86_64-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/2017-08-31/rust-std-1.20.0-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-x86_64-unknown-linux-gnu.tar.gz
 	 https://static.rust-lang.org/dist/${_date}/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz"
 	checksum+="
-	 000e776431718a32b5d40c4aa6e09b3425f0b71dea8c95e718d29b8c0f5b35d3
-	 a1b3e13b9d6f9aa713783145cb83070b1dabbe17349043b3528031d7712ca929
+	 47dad29c64cd60fb2e3e5a723c191c99dae883bf8e723dd0e6631427f148b87f
+	 4c431863a6a03b24b69c539de92fbdaec916e2b70df89cb788ac1e09b2e0b70a
 	 28e5aae4c7f928ab41a438bcf75842480da4103c8c1eb686a07460d6b2fb74d9"
 	;;
 i686)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://static.rust-lang.org/dist/2017-08-31/rustc-1.20.0-i686-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/2017-08-31/rust-std-1.20.0-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-i686-unknown-linux-gnu.tar.gz
 	 https://static.rust-lang.org/dist/${_date}/cargo-nightly-i686-unknown-linux-gnu.tar.xz"
 	checksum+="
-	 f8ee3a910df757b071472146f7c9ed70b0990f20e7a623cf16c8ada4f6e4e620
-	 f18fbdc7217f9b014a823c7308407ef30610ebf32f76d879bfa3e3f6937079df
+	 706744c8f8373b4214650e790229e5bd410f8e1107680865ef25e29f1c7e5466
+	 372aa5a123216dcca204caa9bd909c2db711554ac37f9a8d7222c190767223e3
 	 a3876e72e8424508d764375928bad386c06959d3b8fc9249fb90b578adc15d80"
 	;;
 esac
@@ -113,6 +113,7 @@ do_configure() {
 		--release-channel=stable
 		--disable-rpath
 		--disable-docs
+		--disable-codegen-tests
 		--enable-ccache
 		--llvm-root=/usr
 		--enable-local-rust