diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 05d228db8d..8e3cc04a13 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -9,7 +9,7 @@ lib32disabled=yes
 patch_args="-Np1"
 build_style=configure
 make_build_args="dist VERBOSE=1"
-only_for_archs="x86_64 x86_64-musl"
+only_for_archs="i686 x86_64 x86_64-musl"
 hostmakedepends="cmake curl pkg-config python"
 makedepends="libffi-devel lld-devel llvm ncurses-devel zlib-devel"
 short_desc="Safe, concurrent, practical systems language"
@@ -41,6 +41,17 @@ x86_64)
 	 08f8cde5c305ba22052871292336d63cb493cbf38bb050ab0b8496a3536cac1c
 	 8ecf9bca3ece59ee291afda5fd8c371739d0d52771912c5da0d909fd9d130b3f"
 	;;
+i686)
+	# extract from src/stage0.txt
+	distfiles+="
+	 https://static.rust-lang.org/dist/2016-12-18/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/2016-12-18/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
+	checksum+="
+	 af22508823865245dc1c451d79679c33898092573608017b5b4b764b1dfe205e
+	 6ddbcb00893645d9c06ef2f82d60e516e618cfed03abe6deb0a18be7914d3394
+	 8fb0cacdd2ab32b8dbdf74ae63914e1f97baf8bac0e8c1db1414a57677b93f88"
+	;;
 esac
 
 post_extract() {
@@ -87,29 +98,29 @@ pre_build() {
 do_configure() {
 	local _triplet
 	case $XBPS_TARGET_MACHINE in
-		i686*) _triplet=i686-unknown-linux-gnu;;
+		i686) _triplet=i686-unknown-linux-gnu;;
 		x86_64) _triplet=x86_64-unknown-linux-gnu;;
 		x86_64-musl) _triplet=x86_64-unknown-linux-musl;;
 		*) _triplet=$XBPS_TARGET_MACHINE;;
 	esac
 	export LD_LIBRARY_PATH="$wrksrc/stage0/lib"
 	configure_args="
-		--prefix=/usr 
-		--host=${_triplet} 
-		--build=${_triplet} 
-		--release-channel=stable 
+		--prefix=/usr
+		--host=${_triplet}
+		--build=${_triplet}
+		--release-channel=stable
 		--disable-rpath
-		--enable-ccache 
-		--enable-rustbuild 
-		--llvm-root=/usr 
+		--enable-ccache
+		--enable-rustbuild
+		--llvm-root=/usr
 	"
 	case "$XBPS_TARGET_MACHINE" in
-        *-musl) 
+	*-musl)
 		configure_args+="--musl-root=/usr --disable-jemalloc"
 		;;
 	esac
 	./configure $configure_args
- 
+
 }
 do_install() {
 	vmkdir usr