diff --git a/akka-docs/_sphinx/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html
index d60fe7d599..6a2f4da7b6 100644
--- a/akka-docs/_sphinx/themes/akka/layout.html
+++ b/akka-docs/_sphinx/themes/akka/layout.html
@@ -82,7 +82,7 @@
                 {%- endif %}
               </li>
               <li>
-                Version {{ version|e }}
+                Version {{ release|e }}
               </li>
             </ul>
           </div>
diff --git a/project/scripts/release b/project/scripts/release
index 31714aace4..1a22ae184c 100755
--- a/project/scripts/release
+++ b/project/scripts/release
@@ -2,6 +2,9 @@
 #
 # Release script for Akka.
 #
+# ATTENTION: This script involves calling `git clean -fxd` which will remove all untracked
+#            files from your working directory (including IDE settings).
+#
 # Prerequisites and Installation Instructions
 #
 # 1) You must be able to sign the artifacts with PGP
@@ -211,6 +214,9 @@ declare -r initial_branch=$(get_current_branch)
   fail "There are uncommitted changes - please commit before releasing"
 }
 
+(read -p "The working directory will now be cleaned from all non-tracked files. Are you sure you want this? " x; test "$x" = yes) || fail "bailing out"
+git clean -fxd || fail "cannot git clean -fxd"
+
 # the branch we'll release on
 declare -r release_branch="releasing-${version}"