diff --git a/configure.ac b/configure.ac
index 1ec6eb4c..3da4447e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@ AS_IF([test "x$esapi_sf" = "xyes"],
 
 AC_ARG_WITH(
   [fapi],
-  [AS_HELP_STRING([--with-fapi],
+  [AS_HELP_STRING([--enable-fapi],
     [enable or disable the fapi backend. Default is "auto" to autodetect])],
     [enable_fapi=$withval],
     [enable_fapi=auto])
diff --git a/docs/FAPI.md b/docs/FAPI.md
index 0a2ff2b0..8dbd29bb 100644
--- a/docs/FAPI.md
+++ b/docs/FAPI.md
@@ -11,7 +11,7 @@ code was implemented using the Enhanced System API (ESAPI) and for on disk stora
 ## Build Time
 
 At the time the package is built, it will detect tss2-fapi library and automatically configure it's inclusion into the tpm2-pkcs11 library. One can *explicitly* configure this
-with `--with-fapi=yes|no`.
+with `--enable-fapi=yes|no`.
 
 ## Run Time
 
@@ -23,8 +23,8 @@ You can take a few actions if you run into this issue:
 1. Ignore them, and optionally disable FAPI error logging:
     - `export TSS2_LOG=fapi+NONE`
 
-2. Reconfigure the package with `--with-fapi=no`:
-    - `./configure --with-fapi=no`
+2. Reconfigure the package with `--enable-fapi=no`:
+    - `./configure --enable-fapi=no`
 
 3. Provision FAPI using `tss2_provision`. See the tpm2-tools project for more information:
     - <https://github.com/tpm2-software/tpm2-tools/blob/master/man/tss2_provision.1.md>