diff --git a/bucket/rustup-gnu.json b/bucket/rustup-gnu.json
index af665d5618a9a..21ca7e37788ae 100644
--- a/bucket/rustup-gnu.json
+++ b/bucket/rustup-gnu.json
@@ -32,8 +32,8 @@
         ".rustup"
     ],
     "checkver": {
-        "url": "https://raw.githubusercontent.com/rust-lang-nursery/rustup.rs/master/Cargo.toml",
-        "regex": "version = \"([\\d.]+)\""
+        "url": "https://raw.githubusercontent.com/rust-lang/rustup.rs/master/Cargo.toml",
+        "regex": "version = \"([\\d.]+)\"\nedition"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/rustup-msvc.json b/bucket/rustup-msvc.json
index 0528542318592..08837b1f2b418 100644
--- a/bucket/rustup-msvc.json
+++ b/bucket/rustup-msvc.json
@@ -39,8 +39,8 @@
         ".rustup"
     ],
     "checkver": {
-        "url": "https://raw.githubusercontent.com/rust-lang-nursery/rustup.rs/master/Cargo.toml",
-        "regex": "version = \"([\\d.]+)\""
+        "url": "https://raw.githubusercontent.com/rust-lang/rustup.rs/master/Cargo.toml",
+        "regex": "version = \"([\\d.]+)\"\nedition"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/rustup.json b/bucket/rustup.json
index 25b922f870612..79d62a396a5b1 100644
--- a/bucket/rustup.json
+++ b/bucket/rustup.json
@@ -43,8 +43,8 @@
         ".rustup"
     ],
     "checkver": {
-        "url": "https://raw.githubusercontent.com/rust-lang-nursery/rustup.rs/master/Cargo.toml",
-        "regex": "version = \"([\\d.]+)\""
+        "url": "https://raw.githubusercontent.com/rust-lang/rustup.rs/master/Cargo.toml",
+        "regex": "version = \"([\\d.]+)\"\nedition"
     },
     "autoupdate": {
         "architecture": {