diff --git a/util/build-packages b/util/build-packages
index d38eecb8..de74b89e 100755
--- a/util/build-packages
+++ b/util/build-packages
@@ -286,6 +286,18 @@ update_rel_notes() {
    echo "OK"
 }
 
+update_user_docs() {
+   echo -n "Updating user docs: "
+   $BRANCH/util/write-user-docs $BRANCH/bin/* > /tmp/sphinx-build.output 2>&1
+   if [ $? -ne 0 ]; then
+      warn "Error updating user docs:"
+      cat /tmp/sphinx-build.output >&2
+      exit 1
+   fi
+   rm /tmp/sphinx-build.output
+   echo "OK"
+}
+
 prep_release_dir() {
    echo -n "Preparing release directory: "
    cd $BRANCH
@@ -423,6 +435,7 @@ if [ $UPDATE -eq 1 ]; then
    update_percona_toolkit_pod
    update_changelog
    update_rel_notes
+   update_user_docs 
 fi
 
 # Now that those ^ items are updated, you need to commit and push one more
diff --git a/util/write-user-docs b/util/write-user-docs
index bffc3136..c0f4bd7c 100755
--- a/util/write-user-docs
+++ b/util/write-user-docs
@@ -144,7 +144,7 @@ fi
 BUILD=${BUILD:-1}
 if [ $BUILD -eq 1 ]; then
    # -W treats warnings as errors; remove it to ignore warnings if you must.
-   sphinx-build -W -c $CONFIG -b html $RST $HTML
+   sphinx-build -N -W -c $CONFIG -b html $RST $HTML
    exit_status=$(( exit_status | $? ))
 fi