diff --git a/files/0001-cargo-clipy-edition.patch b/files/0001-cargo-clipy-edition.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-cargo-clipy-edition.patch
@@ -0,0 +1,60 @@
+diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
+index 518c2caf6..ef02e1b66 100644
+--- a/src/tools/clippy/Cargo.toml
++++ b/src/tools/clippy/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["edition"]
++
+ [package]
+ name = "clippy"
+ version = "0.0.212"
+diff --git a/src/tools/clippy/clippy_dev/Cargo.toml b/src/tools/clippy/clippy_dev/Cargo.toml
+index 5380ecd98..4e3c7a250 100644
+--- a/src/tools/clippy/clippy_dev/Cargo.toml
++++ b/src/tools/clippy/clippy_dev/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["edition"]
++
+ [package]
+ name = "clippy_dev"
+ version = "0.0.1"
+diff --git a/src/tools/clippy/clippy_lints/Cargo.toml b/src/tools/clippy/clippy_lints/Cargo.toml
+index 8907dd365..15da5d658 100644
+--- a/src/tools/clippy/clippy_lints/Cargo.toml
++++ b/src/tools/clippy/clippy_lints/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["edition"]
++
+ [package]
+ name = "clippy_lints"
+ # begin automatic update
+diff --git a/src/tools/clippy/rustc_tools_util/Cargo.toml b/src/tools/clippy/rustc_tools_util/Cargo.toml
+index 020de6c33..01dca0a65 100644
+--- a/src/tools/clippy/rustc_tools_util/Cargo.toml
++++ b/src/tools/clippy/rustc_tools_util/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["edition"]
++
+ [package]
+ name = "rustc_tools_util"
+ version = "0.1.0"
+diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml
+index f79609c76..669a5d56c 100644
+--- a/src/tools/miri/Cargo.toml
++++ b/src/tools/miri/Cargo.toml
+@@ -1,5 +1,3 @@
+-cargo-features = ["default-run"]
+-
+ [package]
+ authors = ["Scott Olson <scott@solson.me>"]
+ description = "An experimental interpreter for Rust MIR."
+diff --git a/src/tools/rls/Cargo.toml b/src/tools/rls/Cargo.toml
+index 974b7fda0..73582d0c5 100644
+--- a/src/tools/rls/Cargo.toml
++++ b/src/tools/rls/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["edition"]
++
+ [package]
+ name = "rls"
+ version = "1.31.6"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,12 +1,12 @@
 name       : cargo
-version    : 0.29.0
-release    : 14
+version    : 0.32.0
+release    : 15
 source     :
-    - https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.gz : 1d5a81729c6f23a0a23b584dd249e35abe9c6f7569cee967cc42b1758ecd6486
+    - https://static.rust-lang.org/dist/rustc-1.31.0-src.tar.gz : 9ad54dc0baf1db5fc6a79d54e71c439c82aff85cd96778978456f2958211ef06
 license    :
     - Apache-2.0
     - MIT
-    - GPL-2.0
+    - GPL-2.0-or-later
     - BSD-4-Clause
     - OpenSSL
     - BSD-3-Clause
@@ -24,6 +24,7 @@
 rundeps    :
     - rust
 build      : |
+    %patch -p1 < $pkgfiles/0001-cargo-clipy-edition.patch
     cd src/tools/cargo
     cargo build %JOBS% --release
 install    : |
@@ -31,8 +32,8 @@
     cargo install %JOBS% --root=$installdir/usr
     rm $installdir/usr/.crates.toml
 
-    install -Dm 00644 src/etc/cargo.bashcomp.sh $installdir/usr/share/bash-completion/completions/cargo
-    install -Dm 00644 src/etc/_cargo $installdir/usr/share/zsh/site-functions/_cargo
-    install -Dm 00644 src/etc/man/cargo*.1 -t $installdir/usr/share/man/man1
-    install -dm 00755 $installdir/usr/share/doc/cargo/html
-    mdbook build --dest-dir $installdir/usr/share/doc/cargo/html src/doc
+    install -Dm00644 src/etc/cargo.bashcomp.sh $installdir/usr/share/bash-completion/completions/cargo
+    install -Dm00644 src/etc/_cargo $installdir/usr/share/zsh/site-functions/_cargo
+    install -Dm00644 src/etc/man/cargo*.1 -t $installdir/usr/share/man/man1
+    install -dm00755 $installdir/usr/share/doc/cargo/html
+    mdbook build --dest-dir $installdir/usr/share/doc/cargo/html src/doc
\ No newline at end of file
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,12 +2,12 @@
     <Source>
         <Name>cargo</Name>
         <Packager>
-            <Name>Mateusz Mikuła</Name>
-            <Email>mati865@gmail.com</Email>
+            <Name>F. von Gellhorn</Name>
+            <Email>flinux@vongellhorn.ch</Email>
         </Packager>
         <License>Apache-2.0</License>
         <License>MIT</License>
-        <License>GPL-2.0</License>
+        <License>GPL-2.0-or-later</License>
         <License>BSD-4-Clause</License>
         <License>OpenSSL</License>
         <License>BSD-3-Clause</License>
@@ -28,17 +28,21 @@
         <Files>
             <Path fileType="executable">/usr/bin/cargo</Path>
             <Path fileType="data">/usr/share/bash-completion/completions/cargo</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/css/font-awesome.css</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/fonts/FontAwesome.ttf</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/fonts/fontawesome-webfont.eot</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/fonts/fontawesome-webfont.svg</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/fonts/fontawesome-webfont.ttf</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/fonts/fontawesome-webfont.woff</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/_FontAwesome/fonts/fontawesome-webfont.woff2</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/.nojekyll</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/css/font-awesome.css</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/fonts/FontAwesome.ttf</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/fonts/fontawesome-webfont.eot</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/fonts/fontawesome-webfont.svg</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/fonts/fontawesome-webfont.ttf</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/fonts/fontawesome-webfont.woff</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/FontAwesome/fonts/fontawesome-webfont.woff2</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/ayu-highlight.css</Path>
-            <Path fileType="doc">/usr/share/doc/cargo/html/book.css</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/book.js</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/clipboard.min.js</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/css/chrome.css</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/css/general.css</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/css/print.css</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/css/variables.css</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/elasticlunr.min.js</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/faq.html</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/favicon.png</Path>
@@ -76,6 +80,7 @@
             <Path fileType="doc">/usr/share/doc/cargo/html/reference/unstable.html</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/searcher.js</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/searchindex.js</Path>
+            <Path fileType="doc">/usr/share/doc/cargo/html/searchindex.json</Path>
             <Path fileType="doc">/usr/share/doc/cargo/html/tomorrow-night.css</Path>
             <Path fileType="man">/usr/share/man/man1/cargo-bench.1</Path>
             <Path fileType="man">/usr/share/man/man1/cargo-build.1</Path>
@@ -107,12 +112,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="14">
-            <Date>2018-08-06</Date>
-            <Version>0.29.0</Version>
+        <Update release="15">
+            <Date>2018-12-07</Date>
+            <Version>0.32.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Mateusz Mikuła</Name>
-            <Email>mati865@gmail.com</Email>
+            <Name>F. von Gellhorn</Name>
+            <Email>flinux@vongellhorn.ch</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file