diff --git a/rust.changes b/rust.changes
index c11446d..4294812 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 31 09:41:33 UTC 2017 - luke.nukem.jones@gmail.com
+
+- Adjust build so that aarch and ARM architectures use bootstrap for
+  initial build
+
 -------------------------------------------------------------------
 Tue Jan 31 04:25:06 UTC 2017 - luke.nukem.jones@gmail.com
 
diff --git a/rust.spec b/rust.spec
index 8632b68..66a5a9c 100644
--- a/rust.spec
+++ b/rust.spec
@@ -39,25 +39,31 @@ Recommends:     cargo
 Obsoletes:      rustc-1_9
 Provides:       rustc = %{version}
 Provides:       rustc-stable = %{version} 
-Conflicts:      rustc-bootstrap <= %{version}
+Conflicts:      rustc-bootstrap
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
 %if 0%{?suse_version}
 BuildRequires:  fdupes
 %endif
-%if %{with bootstrap}
+%ifarch %{arm}
 BuildRequires:  rustc-bootstrap <= %{prev_version}
 BuildRequires:  rustc-bootstrap >= %{prev_version}
-%else
-%ifnarch armv7hl
+    %else
+    %ifarch aarch64
+BuildRequires:  rustc-bootstrap <= %{prev_version}
+BuildRequires:  rustc-bootstrap >= %{prev_version}
+        %else
+        %if %{with bootstrap}
+BuildRequires:  rustc-bootstrap <= %{prev_version}
+BuildRequires:  rustc-bootstrap >= %{prev_version}
+            %else
+            %if %{without bootstrap}
 BuildRequires:  rust <= %{version}
 BuildRequires:  rust >= %{prev_version}
-%endif
-%ifarch armv7hl
-BuildRequires:  rustc-bootstrap <= %{prev_version}
-BuildRequires:  rustc-bootstrap >= %{prev_version}
-%endif
+            %endif
+        %endif
+   %endif
 %endif
 
 %description