diff --git a/rust-toolchain b/rust-toolchain
index 5b13884152f..076504e3937 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-03-04
+nightly-2020-03-07
diff --git a/rustup.sh b/rustup.sh
index afa7888cc0c..aeb60c50c09 100755
--- a/rustup.sh
+++ b/rustup.sh
@@ -4,8 +4,7 @@ set -e
 
 case $1 in
     "prepare")
-        # FIXME Automatically detect latest nightly
-        read -p "Date of nightly to use: " TOOLCHAIN
+        TOOLCHAIN=$(date +%Y-%m-%d)
 
         echo "=> Installing new nightly"
         rustup toolchain install --profile minimal nightly-${TOOLCHAIN} # Sanity check to see if the nightly exists