diff --git a/add-soname.patch b/add-soname.patch
index 0204e44..adc3891 100644
--- a/add-soname.patch
+++ b/add-soname.patch
@@ -20,16 +20,16 @@ Forwarded: no
 
 --- a/src/librustc_trans/back/link.rs
 +++ b/src/librustc_trans/back/link.rs
-@@ -840,6 +840,12 @@
+@@ -1017,12 +1017,6 @@
          cmd.args(&rpath::get_rpath_flags(&mut rpath_config));
      }
- 
-+    if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib) && t.options.linker_is_gnu {
-+        let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap());
-+        let soname = [String::from("-Wl,-soname=") + &filename];
-+        cmd.args(&soname);
-+    }
-+
+
+-    if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib) && t.options.linker_is_gnu {
+-        let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap());
+-        let soname = [String::from("-Wl,-soname=") + &filename];
+-        cmd.args(&soname);
+-    }
+-
      // Finally add all the linker arguments provided on the command line along
      // with any #[link_args] attributes found inside the crate
      if let Some(ref args) = sess.opts.cg.link_args {
diff --git a/cargo-0.21.0-aarch64-unknown-linux-gnu.tar.gz b/cargo-0.21.0-aarch64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index cc062fe..0000000
--- a/cargo-0.21.0-aarch64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index c716c3b..0000000
--- a/cargo-0.21.0-armv7-unknown-linux-gnueabihf.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index fd089d0..0000000
--- a/cargo-0.21.0-i686-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 80d044b..0000000
--- a/cargo-0.21.0-powerpc64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index f0c03fe..0000000
--- a/cargo-0.21.0-powerpc64le-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index fea125f..0000000
--- a/cargo-0.21.0-s390x-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 24a95a3..0000000
--- a/cargo-0.21.0-x86_64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:caccf4ab039c806a9e6fdc7fe389cc88fb771e28e30d93c07a5c56ef845cdf57
-size 5148481
diff --git a/cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz b/cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..3001913
--- /dev/null
+++ b/cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:440b6f3b9f7be895f2bffe5e314c98af41421c2b9cb1cfd19760e896b18eef87
+size 4217617
diff --git a/cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz b/cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz
new file mode 100644
index 0000000..348ec62
--- /dev/null
+++ b/cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54f09a39a74905ab9bb89dae898479713360dfb2ee126cb592dff517ea06b7f3
+size 4972523
diff --git a/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz b/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..ef4ffef
--- /dev/null
+++ b/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:158ea19c2c72a168de2a71a2b2fda7435080d238439f4460a7bb4a082f109443
+size 5239010
diff --git a/cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz b/cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..945bcb8
--- /dev/null
+++ b/cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:360a14b1a5aaee55b06c09194c59da91e3a25a5155fc7c4e9905ac63bdf3d104
+size 4950668
diff --git a/cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz b/cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..bb93ed1
--- /dev/null
+++ b/cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9dbe96162c7cb3e8be1e525ac5d5fe4117594df1410e65bdc91ae333c4e2586f
+size 4915347
diff --git a/cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz b/cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..8e80c24
--- /dev/null
+++ b/cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4e65fcd6be9de6f5f8942d31faa60434aa29523ac1214bf52df25e283b199a1
+size 4370992
diff --git a/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz b/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..dbd0e20
--- /dev/null
+++ b/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eca53c055006f3a77871317368d4bd585ffb04ddbf0ecd2aa79aaf5cc4c84280
+size 5317576
diff --git a/rust.changes b/rust.changes
index 00579a5..c79a33c 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,7 +1,23 @@
 -------------------------------------------------------------------
-Mon Oct 16 20:40:32 UTC 2017 - luke.nukem.jones@gmail.com
+Tue Oct 17 22:53:28 UTC 2017 - luke.nukem.jones@gmail.com
 
-- Re-enable x86 build but restricted to i686
+- Update to 1.21.0
+- Language changes:
+  + You can now use static references for literals.
+  + Relaxed path syntax. Optional `::` before `<` is now allowed in all contexts.
+- Compiler changes:
+  + Upgraded jemalloc to 4.5.0[43911]
+  + Enabled unwinding panics on Redox[43917]
+  + Now runs LLVM in parallel during translation phase.[43506]
+- Librarie changes:
+  + Generate builtin impls for `Clone` for all arrays and tuples that
+  are `T: Clone`[43690]
+  +`Stdin`, `Stdout`, and `Stderr` now implement `AsRawFd`.[43459]
+  + `Rc` and `Arc` now implement `From<&[T]> where T: Clone`, `From<str>`,
+  `From<String>`, `From<Box<T>> where T: ?Sized`, and `From<Vec<T>>`.[42565]
+- Stabilized APIs
+  +`std::mem::discriminant`
+- Update add-soname.patch to apply cleanly
 
 -------------------------------------------------------------------
 Sat Sep 23 00:29:39 UTC 2017 - luke.nukem.jones@gmail.com
diff --git a/rust.spec b/rust.spec
index 690f075..fd06033 100644
--- a/rust.spec
+++ b/rust.spec
@@ -17,9 +17,9 @@
 #
 
 
-%global prev_rust 1.19.0
-%global cargo_version 0.21.0
-%bcond_without rust_bootstrap
+%global prev_rust 1.20.0
+%global cargo_version 0.22.0
+%bcond_with rust_bootstrap
 
 %global rust_arch %{_arch}
 %global abi gnu
@@ -44,7 +44,7 @@
 %global rustlibdir %{common_libdir}/rustlib
 
 Name:           rust
-Version:        1.20.0
+Version:        1.21.0
 Release:        0
 Summary:        A systems programming language
 License:        MIT or Apache-2.0
@@ -84,8 +84,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # bootstrapped before we can build the n+1 release
 ExclusiveArch:  x86_64 %{arm} aarch64 ppc64 ppc64le s390x
 %ifarch %ix86
-ExclusiveArch: i586 i686
-BuildArch: i686
+ExclusiveArch:  i586 i686
+BuildArch:      i686
 %endif
 
 %if 0%{?suse_version}
diff --git a/rustc-1.20.0-src.tar.gz b/rustc-1.20.0-src.tar.gz
deleted file mode 100644
index 2f7ca72..0000000
--- a/rustc-1.20.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2aa4875ff4472c6e35262bbb9052cb2623da3dae6084a858cc59d36f33f18214
-size 50418082
diff --git a/rustc-1.21.0-src.tar.gz b/rustc-1.21.0-src.tar.gz
new file mode 100644
index 0000000..f61749e
--- /dev/null
+++ b/rustc-1.21.0-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa
+size 52555346