diff --git a/Documentation/meson.build b/Documentation/meson.build
index 7b497aeea..d3d64f71c 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -7,8 +7,8 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc',
 # Doxygen
 #
 
-doxygen = find_program('doxygen', required : false)
-dot = find_program('dot', required : false)
+doxygen = find_program('doxygen', required : get_option('documentation'))
+dot = find_program('dot', required : get_option('documentation'))
 
 if doxygen.found() and dot.found()
     cdata = configuration_data()
@@ -42,7 +42,7 @@ endif
 
 sphinx = find_program('sphinx-build-3', required : false)
 if not sphinx.found()
-    sphinx = find_program('sphinx-build', required : false)
+    sphinx = find_program('sphinx-build', required : get_option('documentation'))
 endif
 
 if sphinx.found()
diff --git a/meson.build b/meson.build
index dd71390ba..6d7501413 100644
--- a/meson.build
+++ b/meson.build
@@ -110,9 +110,7 @@ subdir('src')
 # The documentation and test components are optional and can be disabled
 # through configuration values. They are enabled by default.
 
-if get_option('documentation')
-    subdir('Documentation')
-endif
+subdir('Documentation')
 
 if get_option('test')
     subdir('test')
diff --git a/meson_options.txt b/meson_options.txt
index d2e07ef14..7f7b3e597 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,7 +6,7 @@ option('android',
         description : 'Compile libcamera with Android Camera3 HAL interface')
 
 option('documentation',
-        type : 'boolean',
+        type : 'feature',
         description : 'Generate the project documentation')
 
 option('gstreamer',