diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index f2414500..28aa95d2 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -5,6 +5,7 @@ Release notes
 ------
 
 * Removed a virtual build and test environment based on Vagrant.
+* Update ``autohelp-wrapper`` to support RST output.
 
 0.31.0
 ------
diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper
index f405561d..792eb0da 100755
--- a/autogenerate_config_docs/autohelp-wrapper
+++ b/autogenerate_config_docs/autohelp-wrapper
@@ -29,12 +29,13 @@ FAST=0
 usage() {
     echo "Wrapper for autohelp.py"
     echo "Usage:"
-    echo "  $(basename $0) [ OPTIONS ] update|docbook|setup [ project1 ... ]"
+    echo "  $(basename $0) [ OPTIONS ] create|update|docbook|rst|setup [ project1 ... ]"
     echo
     echo "Subcommands:"
     echo "  create:     Create an initial flagmapping file"
     echo "  update:     Update the flagmapping files"
-    echo "  docbook:    Generate the options tables"
+    echo "  docbook:    Generate the options tables in docbook format"
+    echo "  rst:        Generate the options tables in RST format"
     echo "  setup:      Install the environment only"
     echo
     echo "Options:"
@@ -139,7 +140,7 @@ ACTION=$1
 shift
 
 case $ACTION in
-    create|update|docbook|setup) ;;
+    create|update|docbook|rst|setup) ;;
     *)
         usage
         exit 1
@@ -245,5 +246,12 @@ for project in $PROJECTS; do
             $AUTOHELP docbook $project -i $SOURCESDIR/$project/$project $extra_flags $AUTOOPT
         fi
         ;;
+    rst)
+        if [ "$project" = "swift" ]; then
+            $EXTRACT_SWIFT rst -m $MANUALSREPO -s $SOURCESDIR/swift
+        else
+            $AUTOHELP rst $project -i $SOURCESDIR/$project/$project $extra_flags $AUTOOPT
+        fi
+        ;;
     esac
 done