diff --git a/meson_options.txt b/meson_options.txt
index 0147caf..64b9a3f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -522,7 +522,7 @@ option(
   type : 'array',
   value : [],
   choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui',
-             'nir', 'nouveau', 'lima', 'panfrost', 'asahi', 'imagination',
+             'nir', 'nouveau', 'lima', 'aubinator', 'panfrost', 'asahi', 'imagination',
              'all', 'dlclose-skip'],
   description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
 )
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 0aa34ac..5257927 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -1,6 +1,7 @@
 # Copyright © 2017 Intel Corporation
 # SPDX-License-Identifier: MIT
 
+if with_tools.contains('aubinator')
 libintel_tools = static_library(
   'intel_tools',
   files(
@@ -25,6 +26,7 @@ libintel_tools = static_library(
   gnu_symbol_visibility : 'hidden',
   install : false,
 )
+endif
 
 idep_libintel_tools = declare_dependency(
   link_with : libintel_tools,
@@ -180,6 +182,7 @@ endif
 if with_tools.contains('intel-ui')
   subdir('imgui')
 
+  if with_tools.contains('aubinator')
   aubinator_viewer = executable(
     'aubinator_viewer',
     files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'),
@@ -212,6 +215,7 @@ if with_tools.contains('intel-ui')
     cpp_args : ['-fpermissive', '-Wno-parentheses'],
     install : true
   )
+  endif
 endif
 
 if with_intel_tools
-- 
2.25.1