diff --git a/build/tools/post-release.sh b/build/tools/post-release.sh
index 6e7a3e6bc9..dc1ba31a8d 100755
--- a/build/tools/post-release.sh
+++ b/build/tools/post-release.sh
@@ -8,8 +8,12 @@ topdir=`dirname $0`/../..
 # Build the file list for sha1sums, from `docs/release.md`
 declare -a files=(`sed -n '/^## Download Verification/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`)
 
-# Get the release version
-ver_string=`grep '#define wxVERSION_STRING ' $topdir/include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'`
+# Get the release version unless it's given explicitly on the command line.
+if [ -z $1 ]; then
+    ver_string=`grep '#define wxVERSION_STRING ' $topdir/include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'`
+else
+    ver_string=$1
+fi
 
 for i in "${files[@]}"
 do
@@ -20,5 +24,4 @@ do
     sed -i -E "/^\s*[0]{40}\s{2}wx/ s/(^\s*)[0]{40}(\s{2}$i)/\1$sha1sum\2/" $topdir/docs/release.md
 done
 
-# Commit sha1sum related changes
-git commit -m "Update released files sha1sums after $ver_string release" $topdir/docs/release.md
+echo "File $topdir/docs/release.md updated after $ver_string release, don't forget to commit it."
diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md
index 0285addaa9..ec9b392dbf 100644
--- a/docs/contributing/how-to-release.md
+++ b/docs/contributing/how-to-release.md
@@ -83,15 +83,18 @@ ensure you have the appropriate tag or commit checked out.
    contained in the copied release ZIP and not from the current working wx
    directory.
 
-4. Copy these Windows packages back to your Linux or OSX `distrib/release/x.y.z`
+4. Copy `wxMSW-x.y.z-Setup.exe` back to your Linux or OSX `distrib/release/x.y.z`
    directory so you can continue with the upload step with all packages
-   available:
+   available. Also create a ZIP file from the CHM one:
 
-    wxMSW-x.y.z-Setup.exe
-    wxWidgets-x.y.z.chm
+    zip wxWidgets-x.y.z-docs-chm.zip wxWidgets-x.y.z.chm
 
-5. Run `./build/tools/post-release.sh` to update the sha1sums in
-   `docs/release.md` and commit the changes.
+   and copy/move it to the same directory.
+
+5. Update the version in `docs/release.md` (typically just a global search and
+   replace) and run `./build/tools/post-release.sh` to update the sha1sums in
+   it, then commit the changes. Notice that when making an RC, the version must
+   be explicitly specified on this script command line.
 
 ## Uploading
 
@@ -105,7 +108,7 @@ Attach the following files to it:
     wxWidgets-x.y.z.7z
     wxWidgets-x.y.z.tar.bz2
     wxWidgets-x.y.z.zip
-    wxWidgets-x.y.z.chm
+    wxWidgets-x.y.z-docs-chm.zip
     wxWidgets-x.y.z-docs-html.tar.bz2
     wxWidgets-x.y.z-docs-html.zip
     wxWidgets-x.y.z-headers.7z