diff --git a/doc/sphinx/doxygen.ini.in b/doc/sphinx/doxygen.ini.in
index 1e71d07b..29f57882 100644
--- a/doc/sphinx/doxygen.ini.in
+++ b/doc/sphinx/doxygen.ini.in
@@ -759,7 +759,7 @@ WARN_NO_PARAMDOC       = NO
 # a warning is encountered.
 # The default value is: NO.
 
-WARN_AS_ERROR          = YES
+WARN_AS_ERROR          = @MESON_WERROR@
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build
index 46947a6b..1f573624 100644
--- a/doc/sphinx/meson.build
+++ b/doc/sphinx/meson.build
@@ -39,6 +39,7 @@ sphinx_conf = configure_file(
 doxy_conf_data = configuration_data()
 doxy_conf_data.set('SRC_ROOT', meson.source_root())
 doxy_conf_data.set('OUTPUT_DIR', doxygen_database)
+doxy_conf_data.set('MESON_WERROR', get_option('werror') == true ? 'YES' : 'NO')
 doxygen_conf_weston = configure_file(
 		input: 'doxygen.ini.in',
 		output: 'doxygen.ini',