diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in
index 1a6698570a..0dcf176dfd 100644
--- a/package/tpm2-tools/Config.in
+++ b/package/tpm2-tools/Config.in
@@ -21,6 +21,18 @@ config BR2_PACKAGE_TPM2_TOOLS
 
 	  https://github.com/tpm2-software/tpm2-tools
 
+if BR2_PACKAGE_TPM2_TOOLS
+
+config BR2_PACKAGE_TPM2_TOOLS_FAPI
+	bool "fapi tools"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	select BR2_PACKAGE_TPM2_TSS_FAPI
+	help
+	  This option enables Feature API (FAPI) support in
+	  tpm2-tools. The FAPI tools are prefixed with tss2_.
+
+endif
+
 comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar"
 	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
 		!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk
index 8675344805..01b029d942 100644
--- a/package/tpm2-tools/tpm2-tools.mk
+++ b/package/tpm2-tools/tpm2-tools.mk
@@ -20,4 +20,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening
 # do not build man pages
 TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC=''
 
+ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y)
+TPM2_TOOLS_CONF_OPTS += --enable-fapi
+else
+TPM2_TOOLS_CONF_OPTS += --disable-fapi
+endif
+
 $(eval $(autotools-package))