diff --git a/README.md b/README.md
index 26df1316..f0804bfc 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@
     <a href="https://crates.io/crates/rojo">
         <img src="https://img.shields.io/crates/v/rojo.svg?label=version" alt="Latest server version" />
     </a>
-    <a href="https://lpghatguy.github.io/rojo">
-        <img src="https://img.shields.io/badge/documentation-website-brightgreen.svg" alt="Rojo Documentation" />
+    <a href="https://lpghatguy.github.io/rojo/0.4.x">
+        <img src="https://img.shields.io/badge/documentation-0.4.x-brightgreen.svg" alt="Rojo Documentation" />
     </a>
 </div>
 
@@ -38,7 +38,7 @@ Soon, Rojo will be able to:
 * Sync `rbxmx` models between the filesystem and Roblox Studio
 * Package projects into `rbxmx` files from the command line
 
-## [Documentation](https://lpghatguy.github.io/rojo)
+## [Documentation](https://lpghatguy.github.io/rojo/0.4.x)
 You can also view the documentation by browsing the [docs](https://github.com/LPGhatguy/rojo/tree/master/docs) folder of the repository, but because it uses a number of Markdown extensions, it may not be very readable.
 
 ## Inspiration and Alternatives
diff --git a/docs/index.md b/docs/index.md
index 886c9fd0..712f95a3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,6 @@
 This is the documentation home for Rojo.
 
-Other versions of these docs:
+Available versions of these docs:
 
 * [0.5.x](https://lpghatguy.github.io/rojo/0.5.x)
 * [0.4.x](https://lpghatguy.github.io/rojo/0.4.x)
diff --git a/generate-docs b/generate-docs
index 159d379a..6366a096 100644
--- a/generate-docs
+++ b/generate-docs
@@ -3,7 +3,8 @@
 # Kludged documentation generator to support multiple versions.
 # Make sure the `site` folder is a checkout of this repository's `gh-pages`
 # branch.
-# To use, run `generate-docs` in the root of the repository.
+# To use, copy this file to `generate-docs.run` so that Git will leave it alone,
+# then run `generate-docs.run` in the root of the repository.
 
 set -e
 
@@ -12,12 +13,10 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 echo "Building 0.4.x"
 git checkout v0.4.x
 git pull
-mkdocs build --site-dir site
 mkdocs build --site-dir site/0.4.x
 
-git checkout master
-
 echo "Building master"
+git checkout master
 mkdocs build --site-dir site/master
 
 echo "Building 0.5.x"