diff --git a/rust.spec b/rust.spec
index 18a6844..d0107d0 100644
--- a/rust.spec
+++ b/rust.spec
@@ -19,6 +19,7 @@
 
 %global prev_rust 1.19.0
 %global cargo_version 0.21.0
+%bcond_without rust_bootstrap
 
 %global rust_arch %{_arch}
 %global abi gnu
@@ -32,12 +33,16 @@
 %ifarch ppc64le
 %global rust_arch powerpc64le
 %endif
+# Must restrict the x86 build to i686 since i586 is currently unsupported
+%ifarch %ix86
+%global rust_arch i686
+%endif
 %global rust_triple %{rust_arch}-unknown-linux-%{abi}
 
 %global dl_url https://static.rust-lang.org/dist
 %global common_libdir %{_prefix}/lib
 %global rustlibdir %{common_libdir}/rustlib
-%bcond_without rust_bootstrap
+
 Name:           rust
 Version:        1.20.0
 Release:        0