diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index f6d8988d88..1b9bd492d2 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,10 +1,11 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}.rs-${version}"
-conflicts="cargo rust"
-hostmakedepends="cargo perl pkg-config"
+build_style=cargo
+configure_args="--features no-self-update --bin rustup-init"
+hostmakedepends="perl pkg-config"
 makedepends="libressl-devel zlib-devel libcurl-devel"
 short_desc="The Rust toolchain installer"
 maintainer="Daniel Lee Ramírez <dleeram@protonmail.com>"
@@ -12,15 +13,13 @@ license="Apache-2.0, MIT"
 homepage="https://www.rustup.rs"
 distfiles="https://github.com/rust-lang-nursery/${pkgname}.rs/archive/${version}.tar.gz"
 checksum=9671934a6352366d8055769f1f5b297d9a15b4448634ee9fdf7c31c246fa5a4e
-nocross=yes
 
-do_build() {
-	cargo update --package openssl-sys --precise 0.9.28
-	cargo build --release --features no-self-update --bin rustup-init
+pre_build() {
+	cargo update --package openssl-sys --precise 0.9.2
 }
 
 do_install() {
-	vbin target/release/rustup-init rustup
+	vbin target/${RUST_TARGET}/release/rustup-init rustup
 	for cmd in cargo rust-gdb rust-lldb rustc rustdoc; do
 		ln -s rustup ${DESTDIR}/usr/bin/${cmd}
 	done