diff --git a/cargo-0.18.0-aarch64-unknown-linux-gnu.tar.gz b/cargo-0.18.0-aarch64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 16fc1c0..0000000
--- a/cargo-0.18.0-aarch64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ed71b6d89359db8fba738039f8ba201542240c7396d9599fc3d51f49727ca36
-size 4039839
diff --git a/cargo-0.18.0-armv7-unknown-linux-gnueabihf.tar.gz b/cargo-0.18.0-armv7-unknown-linux-gnueabihf.tar.gz
deleted file mode 100644
index e44bb4f..0000000
--- a/cargo-0.18.0-armv7-unknown-linux-gnueabihf.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91abd44766a5169f5391c607b64fb47aca822ecfa953559a36d041b01ae3aeaa
-size 4578488
diff --git a/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz b/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 4ffc94b..0000000
--- a/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbc5a0614345dfb2b41e133bd821257906a839753a9aa4c4590cc9d658164e58
-size 4940463
diff --git a/cargo-0.18.0-powerpc64-unknown-linux-gnu.tar.gz b/cargo-0.18.0-powerpc64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index c8ec8b3..0000000
--- a/cargo-0.18.0-powerpc64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15e79c1e1a9b7e620fe3d88d3b2e5429c8a95b025b2b03a5de4a1d71956fe648
-size 4674070
diff --git a/cargo-0.18.0-powerpc64le-unknown-linux-gnu.tar.gz b/cargo-0.18.0-powerpc64le-unknown-linux-gnu.tar.gz
deleted file mode 100644
index f73ded5..0000000
--- a/cargo-0.18.0-powerpc64le-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5586f28298f88614023534d290525e45e31633450672b33197a92ac36459994
-size 4563666
diff --git a/cargo-0.18.0-s390x-unknown-linux-gnu.tar.gz b/cargo-0.18.0-s390x-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 9bf66e9..0000000
--- a/cargo-0.18.0-s390x-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8de0b700e766e574e855d5f90fc4da37a4939caf71b2c28bd30cf70a8750b20c
-size 4197244
diff --git a/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz b/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 60a43da..0000000
--- a/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3601e95c968850230b137b849ff08a507e50d77ab584c779143a100f1843d8dd
-size 4996337
diff --git a/cargo-0.21.0-aarch64-unknown-linux-gnu.tar.gz b/cargo-0.21.0-aarch64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..cc062fe
--- /dev/null
+++ b/cargo-0.21.0-aarch64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:641575b3c1c10be27d147903fb8a49629ec2ae16e7d975e6f3535234d3e193dc
+size 4137752
diff --git a/cargo-0.21.0-armv7-unknown-linux-gnueabihf.tar.gz b/cargo-0.21.0-armv7-unknown-linux-gnueabihf.tar.gz
new file mode 100644
index 0000000..c716c3b
--- /dev/null
+++ b/cargo-0.21.0-armv7-unknown-linux-gnueabihf.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1635254e63576e38a2addf0e5e7ccbf52b1aacb6118dfd384c5afca69525950a
+size 4813108
diff --git a/cargo-0.21.0-i686-unknown-linux-gnu.tar.gz b/cargo-0.21.0-i686-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..fd089d0
--- /dev/null
+++ b/cargo-0.21.0-i686-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fa17533babef9bbc9e0f73b7c1f397ea8488b972b2c6e0a59509a1792876832
+size 5074270
diff --git a/cargo-0.21.0-powerpc64-unknown-linux-gnu.tar.gz b/cargo-0.21.0-powerpc64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..80d044b
--- /dev/null
+++ b/cargo-0.21.0-powerpc64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc357b22b03d8a6747bb43aa910ef02535f0504605d6abe19bf10748254a04a
+size 4819909
diff --git a/cargo-0.21.0-powerpc64le-unknown-linux-gnu.tar.gz b/cargo-0.21.0-powerpc64le-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..f0c03fe
--- /dev/null
+++ b/cargo-0.21.0-powerpc64le-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:769d64d74cc1071986f276fa25e2ab72b042a529ef48a945725f56c21f4e3a3d
+size 4786376
diff --git a/cargo-0.21.0-s390x-unknown-linux-gnu.tar.gz b/cargo-0.21.0-s390x-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..fea125f
--- /dev/null
+++ b/cargo-0.21.0-s390x-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44f4ce0454dcbcd82f170b11fad7fe913ee42c06bb2bf91dabaeb3662ba169d0
+size 4308109
diff --git a/cargo-0.21.0-x86_64-unknown-linux-gnu.tar.gz b/cargo-0.21.0-x86_64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..24a95a3
--- /dev/null
+++ b/cargo-0.21.0-x86_64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:caccf4ab039c806a9e6fdc7fe389cc88fb771e28e30d93c07a5c56ef845cdf57
+size 5148481
diff --git a/rust.changes b/rust.changes
index 78b0318..46068d4 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Mon Sep  4 22:44:20 UTC 2017 - luke.nukem.jones@gmail.com
+
+- Update to version 1.20.0
+- Remove x86 from build targets
+- Language
+  + [Associated constants are now stabilised.][42809]
+  + [A lot of macro bugs are now fixed.][42913]
+- Compiler
+  + [Struct fields are now properly coerced to the expected field type.][42807]
+  + [Enabled wasm LLVM backend][42571] WASM can now be built with the
+  `wasm32-experimental-emscripten` target.
+  + [Changed some of the error messages to be more helpful.][42033]
+  + [Add support for RELRO(RELocation Read-Only) for platforms that support
+  it.][43170]
+  + [rustc now reports the total number of errors on compilation failure][43015]
+  previously this was only the number of errors in the pass that failed.
+  + [Expansion in rustc has been sped up 29x.][42533]
+  + [added `msp430-none-elf` target.][43099]
+  + [rustc will now suggest one-argument enum variant to fix type mismatch when
+  applicable][43178]
+  + [Fixes backtraces on Redox][43228]
+  + [rustc now identifies different versions of same crate when absolute paths of
+  different types match in an error message.][42826]
+- Libraries
+  + [Relaxed Debug constraints on `{HashMap,BTreeMap}::{Keys,Values}`.][42854]
+  + [Impl `PartialEq`, `Eq`, `PartialOrd`, `Ord`, `Debug`, `Hash` for unsized
+  tuples.][43011]
+  + [Impl `fmt::{Display, Debug}` for `Ref`, `RefMut`, `MutexGuard`,
+  `RwLockReadGuard`, `RwLockWriteGuard`][42822]
+  + [Impl `Clone` for `DefaultHasher`.][42799]
+  + [Impl `Sync` for `SyncSender`.][42397]
+  + [Impl `FromStr` for `char`][42271]
+  + [Fixed how `{f32, f64}::{is_sign_negative, is_sign_positive}` handles
+  NaN.][42431]
+  + [allow messages in the `unimplemented!()` macro.][42155]
+  ie. `unimplemented!("Waiting for 1.21 to be stable")`
+  + [`pub(restricted)` is now supported in the `thread_local!` macro.][43185]
+  + [Upgrade to Unicode 10.0.0][42999]
+  + [Reimplemented `{f32, f64}::{min, max}` in Rust instead of using CMath.][42430]
+  + [Skip the main thread's manual stack guard on Linux][43072]
+  + [Iterator::nth for `ops::{Range, RangeFrom}` is now done in O(1) time][43077]
+  + [`#[repr(align(N))]` attribute max number is now 2^31   + 1.][43097] This was
+  previously 2^15.
+  + [`{OsStr, Path}::Display` now avoids allocations where possible][42613]
+- Compatibility Notes
+  + [Functions with `'static` in their return types will now not be as usable as
+  if they were using lifetime parameters instead.][42417]
+  + [The reimplementation of `{f32, f64}::is_sign_{negative, positive}` now
+  takes the sign of NaN into account where previously didn't.][42430]
+
 -------------------------------------------------------------------
 Fri Sep  1 10:14:10 UTC 2017 - luke.nukem.jones@gmail.com
 
@@ -56,7 +107,7 @@ Tue Aug  8 23:06:44 UTC 2017 - luke.nukem.jones@gmail.com
   + [`cmp::Reverse`]
   + [`Command::envs`]
   + [`thread::ThreadId`]
-  
+
 - Misc
   + [Added `rust-windbg.cmd`][39983] for loading rust `.natvis` files in the
     Windows Debugger.
@@ -306,7 +357,7 @@ Fri Mar 17 05:59:18 UTC 2017 - luke.nukem.jones@gmail.com
     * [rustc: use -Xlinker when specifying an rpath with ',' in it][38798]
     * [`rustc` no longer attempts to provide "consider using an explicit
       lifetime" suggestions][37057]. They were inaccurate.
-      
+
 - Stabilized APIs
     * [`VecDeque::truncate`]
     * [`VecDeque::resize`]
@@ -329,7 +380,7 @@ Fri Mar 17 05:59:18 UTC 2017 - luke.nukem.jones@gmail.com
     * `CommandExt::creation_flags`
     * [`File::set_permissions`]
     * [`String::split_off`]
-    
+
 - Library updates
     * [`[T]::binary_search` and `[T]::binary_search_by_key` now take
       their argument by `Borrow` parameter][37761]
@@ -352,7 +403,7 @@ Fri Mar 17 05:59:18 UTC 2017 - luke.nukem.jones@gmail.com
       `Display`][38909]
     * [`Duration` implements `Sum`][38712]
     * [`String` implements `ToSocketAddrs`][39048]
-    
+
 - Misc fixes
     * [`rustdoc` has a `--sysroot` argument that, like `rustc`, specifies
       the path to the Rust implementation][38589]
@@ -384,7 +435,7 @@ Mon Mar 13 10:14:21 UTC 2017 - dimstar@opensuse.org
 -------------------------------------------------------------------
 Thu Feb 23 07:36:17 UTC 2017 - bg@suse.com
 
-- remove bootstrap for s390x as binaries are available in 
+- remove bootstrap for s390x as binaries are available in
   openSUSE:Factory:zSystems
 
 -------------------------------------------------------------------
@@ -521,7 +572,7 @@ Sun Dec 18 02:41:25 UTC 2016 - luke.nukem.jones@gmail.com
 -------------------------------------------------------------------
 Fri Dec 16 23:27:42 UTC 2016 - luke.nukem.jones@gmail.com
 
-- Revert from v1.13 to v1.11 in preparation for alternative 
+- Revert from v1.13 to v1.11 in preparation for alternative
   packaging.
 
 -------------------------------------------------------------------
@@ -547,7 +598,7 @@ Tue Sep 20 11:46:53 UTC 2016 - kgronlund@suse.com
 -------------------------------------------------------------------
 Tue Sep  6 06:35:03 UTC 2016 - kgronlund@suse.com
 
-- Move to package named rust 
+- Move to package named rust
 
 -------------------------------------------------------------------
 Thu Aug  4 19:41:56 UTC 2016 - mvyskocil@opensuse.org
@@ -575,7 +626,7 @@ Sun Jul 31 15:03:38 UTC 2016 - jengelh@inai.de
 -------------------------------------------------------------------
 Tue Jul 26 13:34:17 UTC 2016 - kgronlund@suse.com
 
-- Rename source package to rustc-1_9 to conform to naming standards. 
+- Rename source package to rustc-1_9 to conform to naming standards.
 
 -------------------------------------------------------------------
 Tue Jul 12 05:57:11 UTC 2016 - mvyskocil@opensuse.org
@@ -602,7 +653,7 @@ Mon Jun 27 15:40:53 UTC 2016 - kgronlund@suse.com
 
 - Fix misleading indentation errors on GCC 6.0
 - Remove snap2.sh
-- Add 0001-Fix-misleading-intentation-errors-on-gcc-6.0.patch 
+- Add 0001-Fix-misleading-intentation-errors-on-gcc-6.0.patch
 - Add 0002-Fix-GCC-6-misleading-indentation-error-in-hoedown.patch
 
 -------------------------------------------------------------------
@@ -780,5 +831,3 @@ Wed Apr 29 12:56:15 UTC 2015 - kgronlund@suse.com
 
 - Version 1.0.0-beta3.
 
-
-
diff --git a/rust.spec b/rust.spec
index 09155cb..dc6dc58 100644
--- a/rust.spec
+++ b/rust.spec
@@ -17,38 +17,29 @@
 #
 
 
-%global prev_rust 1.18.0
-%global cargo_version 0.18.0
+%global prev_rust 1.19.0
+%global cargo_version 0.21.0
+
+%global rust_arch %{_arch}
 %global abi gnu
-%ifarch s390x
-%global _arch s390x
-%endif
 %ifarch armv7hl
-%global _arch armv7
+%global rust_arch armv7
 %global abi gnueabihf
 %endif
-%ifarch aarch64
-%global _arch aarch64
-%endif
 %ifarch ppc64
-%global _arch powerpc64
+%global rust_arch powerpc64
 %endif
 %ifarch ppc64le
-%global _arch powerpc64le
+%global rust_arch powerpc64le
 %endif
-%ifarch x86_64
-%global _arch x86_64
-%endif
-%ifarch %{ix86}
-%global _arch i686
-%endif
-%global rust_triple %{_arch}-unknown-linux-%{abi}
+%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_with bootstrap
 Name:           rust
-Version:        1.19.0
+Version:        1.20.0
 Release:        0
 Summary:        A systems programming language
 License:        MIT or Apache-2.0
@@ -86,7 +77,7 @@ Conflicts:      rustc-bootstrap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Restrict the architectures as building rust relies on being initially
 # bootstrapped before we can build the n+1 release
-ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le s390x
+ExclusiveArch:  x86_64 %{arm} aarch64 ppc64 ppc64le s390x
 
 %if 0%{?suse_version}
 BuildRequires:  fdupes
diff --git a/rustc-1.19.0-src.tar.gz b/rustc-1.19.0-src.tar.gz
deleted file mode 100644
index d0de87f..0000000
--- a/rustc-1.19.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51
-size 50108626
diff --git a/rustc-1.20.0-src.tar.gz b/rustc-1.20.0-src.tar.gz
new file mode 100644
index 0000000..2f7ca72
--- /dev/null
+++ b/rustc-1.20.0-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aa4875ff4472c6e35262bbb9052cb2623da3dae6084a858cc59d36f33f18214
+size 50418082