diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 8240e2294b..553f742e1f 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,33 +1,34 @@
 # Template file for 'rust'
 pkgname=rust
-version=0.6
+version=0.7
 revision=1
-makedepends="which pkg-config perl curl python chrpath"
+build_style=configure
+configure_args="--prefix=/usr --disable-docs --build-triple=$(gcc -dumpmachine)"
+hostmakedepends="which pkg-config perl curl python chrpath"
 short_desc="A safe, concurrent, practical language"
 maintainer="pancake <pancake@nopcode.org>"
 homepage="http://www.rust-lang.org/"
 license="MIT, Apache-2.0"
 distfiles="http://static.rust-lang.org/dist/rust-${version}.tar.gz"
-checksum=e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5
+checksum=0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0
 
-disable_debug=yes
-
-do_configure() {
-	./configure --prefix=${DESTDIR}/usr --disable-docs
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	make install
+post_install() {
 	vinstall COPYRIGHT 644 usr/share/licenses/rust LICENSE
 
-	# Set proper rpath on binaries.
-	for f in rust rustdoc rustc rusti rustpkg; do
-		chrpath -r /usr/lib/rustc/${XBPS_MACHINE}-unknown-linux-gnu/lib ${DESTDIR}/usr/bin/${f}
-	done
+	vmkdir usr/share/vim/vimfiles
+	cp -a src/etc/vim ${DESTDIR}/usr/share/vim/vimfiles
+	find ${DESTDIR}/usr/share/vim -type f -exec chmod 644 {} +
+	find ${DESTDIR}/usr/share/vim -type d -exec chmod 755 {} +
+
+	vinstall src/etc/zsh/_rust 644 usr/share/zsh/site-functions
+	vinstall src/etc/kate/rust.xml 644 usr/share/apps/katepart/syntax
+	vinstall src/etc/gedit/share/mime/packages/rust.xml 644 usr/share/mime/packages
+	vinstall src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \
+		644 usr/share/gtksourceview-3.0/language-specs
+
+	# https://github.com/mozilla/rust/issues/5219
+	cd ${DESTDIR}/usr
+	chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
 }
 
 rust_package() {