diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index a715ed14701..9eb3cde435e 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.14.0
-revision=4
+revision=5
 wrksrc="${pkgname}.rs-${version}"
 build_style=cargo
 configure_args="--features no-self-update --bin rustup-init"
@@ -13,6 +13,7 @@ license="Apache-2.0, MIT"
 homepage="https://www.rustup.rs"
 distfiles="https://github.com/rust-lang-nursery/${pkgname}.rs/archive/${version}.tar.gz"
 checksum=ab125d9b12bf0f3f7e7ad98e826035fa1ae3dbe6ba8b78be4c82f9cde00bc59f
+conflicts="rust cargo"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35
@@ -21,6 +22,11 @@ pre_build() {
 do_install() {
 	vbin target/${RUST_TARGET}/release/rustup-init rustup
 
+	# rustup doesn't set PATH correctly to include these.
+	for cmd in cargo rust-gdb rust-lldb rustc rustdoc; do
+		ln -s rustup ${DESTDIR}/usr/bin/${cmd}
+	done
+
 	if ! [ "$CROSS_BUILD" ]; then
 		# generate shell completions
 		ln -s target/${RUST_TARGET}/release/rustup-init rustup