diff --git a/README.asciidoc b/README.asciidoc
index cdb6986ca..618f24d7f 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -51,6 +51,7 @@ available:
 * A http://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]: +
 image:http://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="http://qutebrowser.org/img/cheatsheet-big.png"]
 * link:doc/quickstart.asciidoc[Quick start guide]
+* A https://www.shortcutfoo.com/app/dojos/qutebrowser[free training course] to remember those key bindings.
 * link:FAQ.asciidoc[Frequently asked questions]
 * link:CONTRIBUTING.asciidoc[Contributing to qutebrowser]
 * link:INSTALL.asciidoc[INSTALL]
@@ -255,6 +256,7 @@ Contributors, sorted by the number of commits in descending order:
 * Gregor Pohl
 * Eivind Uggedal
 * Dietrich Daroch
+* Derek Sivers
 * Daniel Lu
 * Arseniy Seroka
 * Andy Balaam
diff --git a/doc/quickstart.asciidoc b/doc/quickstart.asciidoc
index a29bd942e..b85546f1f 100644
--- a/doc/quickstart.asciidoc
+++ b/doc/quickstart.asciidoc
@@ -24,6 +24,9 @@ What to do now
 * View the link:http://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]
 to make yourself familiar with the key bindings: +
 image:http://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="http://qutebrowser.org/img/cheatsheet-big.png"]
+* There's also a https://www.shortcutfoo.com/app/dojos/qutebrowser[free training
+  course] on shortcutfoo for the keybindings - note that you need to be in
+  insert mode (i) for it to work.
 * Run `:adblock-update` to download adblock lists and activate adblocking.
 * If you just cloned the repository, you'll need to run
 `scripts/asciidoc2html.py` to generate the documentation.