diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d0c54e7d43..bef0f37f03 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,14 +42,6 @@ cd linguist/
 script/bootstrap
 ```
 
-To run Linguist from the cloned repository, you will need to generate the code samples first:
-
-```bash
-bundle exec rake samples
-```
-
-Run this command each time a [sample][samples] has been modified.
-
 To run Linguist from the cloned repository:
 
 ```bash
diff --git a/script/bootstrap b/script/bootstrap
index c928fe7270..c51ad9f63b 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -15,6 +15,10 @@ bundle config --local path vendor/gems
 
 bundle check > /dev/null 2>&1 || bundle install
 
+echo "==> Initialising submodules…"
 git submodule init
 git submodule sync --quiet
 script/fast-submodule-update
+
+echo "==> Generating samples…"
+bundle exec rake samples > /dev/null 2>&1