diff --git a/meson.build b/meson.build
index 03ffbc9..2374b00 100644
--- a/meson.build
+++ b/meson.build
@@ -469,4 +469,6 @@
   link_with : libflashrom.get_static_lib(), # flashrom needs internal symbols of libflashrom
 )
 
-subdir('util')
+if get_option('ich_descriptors_tool').auto() or get_option('ich_descriptors_tool').enabled()
+  subdir('util/ich_descriptors_tool')
+endif
diff --git a/meson_options.txt b/meson_options.txt
index d606565..f0ff2be 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,6 +2,7 @@
 option('usb', type : 'boolean', value : true, description : 'use libusb1')
 option('default_programmer_name', type : 'string', description : 'default programmer')
 option('default_programmer_args', type : 'string', description : 'default programmer arguments')
+option('ich_descriptors_tool', type : 'feature', value : 'auto', description : 'Build ich_descriptors_tool')
 option('print_wiki', type : 'boolean', value : true,  description : 'Print Wiki')
 
 option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
diff --git a/util/meson.build b/util/meson.build
deleted file mode 100644
index 24278d7..0000000
--- a/util/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-subdir('ich_descriptors_tool')