diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template
index 36b554b948..73031f54e2 100644
--- a/doc/fate_config.sh.template
+++ b/doc/fate_config.sh.template
@@ -12,16 +12,21 @@ ignore_tests=
 # the following are optional and map to configure options
 arch=
 cpu=
+toolchain=
 cross_prefix=
 as=
 cc=
+cxx=
 ld=
+nm=
 target_os=
 sysroot=
 target_exec=
 target_path=
 target_samples=
 extra_cflags=
+extra_cxxflags=
+extra_objcflags=
 extra_ldflags=
 extra_libs=
 extra_conf=     # extra configure options not covered above