diff --git a/meson_options.txt b/meson_options.txt
index d243997902f..ab43150669b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -332,7 +332,7 @@ option(
   'tools',
   type : 'array',
   value : [],
-  choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'all'],
+  choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'panfrost', 'all'],
   description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
 )
 option(
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 68442fd3790..80adf9d1cd5 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -66,5 +66,5 @@ bifrost_compiler = executable(
     libpanfrost_encoder,
     libpanfrost_midgard, # references disassemble_midgard...
   ],
-  build_by_default : true
+  build_by_default : with_tools.contains('panfrost')
 )