diff --git a/.github/workflows/reusable-release.yml b/.github/workflows/reusable-release.yml
index 9c2e738ab9c..bab48416a45 100644
--- a/.github/workflows/reusable-release.yml
+++ b/.github/workflows/reusable-release.yml
@@ -413,6 +413,7 @@ jobs:
             ./out/*
 
   build-freebsd-x86_64:
+    if: ${{ vars.ENABLE_PRIVATE_RUNNERS == 1 }}
     name: Build FreeBSD x86_64
     runs-on: [self-hosted, FreeBSD, X64]
     env:
@@ -787,7 +788,7 @@ jobs:
     name: Test FreeBSD x86_64
     runs-on: [self-hosted, FreeBSD, X64]
     needs: ["build-freebsd-x86_64"]
-    if: ${{ inputs.test }}
+    if: ${{ inputs.test && vars.ENABLE_PRIVATE_RUNNERS == 1 }}
     env:
       ADD_CABAL_ARGS: ""
       ARTIFACT: "x86_64-portbld-freebsd"
diff --git a/Cabal/src/Distribution/Simple/Program/Builtin.hs b/Cabal/src/Distribution/Simple/Program/Builtin.hs
index 8a42aa661de..96fd96bd93f 100644
--- a/Cabal/src/Distribution/Simple/Program/Builtin.hs
+++ b/Cabal/src/Distribution/Simple/Program/Builtin.hs
@@ -61,6 +61,9 @@ import qualified Data.Map as Map
 
 -- ------------------------------------------------------------
 
+-- NOTE: if you modify the list of builtin programs below, also update documentation in
+-- the Cabal manual: option `--with-PROG` described in doc/setup-commands.rst
+
 -- | The default list of programs.
 -- These programs are typically used internally to Cabal.
 builtinPrograms :: [Program]
diff --git a/doc/setup-commands.rst b/doc/setup-commands.rst
index 970439e748d..c7e58408460 100644
--- a/doc/setup-commands.rst
+++ b/doc/setup-commands.rst
@@ -201,8 +201,11 @@ files of a package:
     name of a program that can be found on the program search path. For
     example: ``--with-ghc=ghc-6.6.1`` or
     ``--with-cpphs=/usr/local/bin/cpphs``. The full list of accepted
-    programs is not enumerated in this user guide. Rather, run
-    ``cabal install --help`` to view the list.
+    programs is as follows:
+    ``alex``, ``ar``, ``c2hs``, ``cpphs``, ``doctest``, ``gcc``, ``ghc``,
+    ``ghc-pkg``, ``ghcjs``, ``ghcjs-pkg``, ``haddock``, ``happy``,
+    ``hpc``, ``hsc2hs``, ``hscolour``, ``jhc``, ``ld``, ``pkg-config``,
+    ``runghc``, ``strip``, ``tar``, ``uhc``.
 
 .. option:: --PROG-options=OPTS