diff --git a/docs/install.md b/docs/install.md
index a060347a7f1b9cbdb1b110f39361be0e54f585e3..ca93d8361ae6fc91a2e278fb9812737e62c3e54b 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -43,7 +43,7 @@ This guide **does not** cover how to setup the JTAG probe on your system.
 In order to compile and flash a working OpenSK firmware, you will need the
 following:
 
-*   a working [Rust](https://rustup.rs/) toolchain installed on your system
+*   rustup (can be installed with https://rustup.rs/)
 *   python3 and pip
 *   the OpenSSL command line tool
 
diff --git a/setup.sh b/setup.sh
index ccaf518f99598cf116b5d0951a0d7dc692bb6926..091fc334cd6b1f4c52c0dd35bb59bab29de519cc 100755
--- a/setup.sh
+++ b/setup.sh
@@ -13,6 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -e
+
+# Check that rustup and pip3 are installed
+check_command () {
+  if ! which "$1" >/dev/null
+  then
+    echo "Missing $1 command.$2"
+    exit 1
+  fi
+}
+check_command rustup " Follow the steps under https://rustup.rs/ to install it."
+check_command pip3
+
 # Ensure the submodules are pulled and up-to-date
 git submodule update --init