diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build
index 2f46773a..87153a2b 100644
--- a/doc/sphinx/meson.build
+++ b/doc/sphinx/meson.build
@@ -55,6 +55,7 @@ script_data.set('DOCTREES_DIR', meson.current_build_dir() + '/doctrees')
 
 script_data.set('DOXYGEN_CONF', meson.current_build_dir() + '/doxygen.ini')
 script_data.set('DOXYGEN_CMD', doxygen.full_path())
+script_data.set('MESON_WERROR', get_option('werror') == true ? 'YES' : 'NO')
 script_data.set('SPHINX_CMD', sphinx.full_path())
 script_doxy_sphinx = configure_file(
 	input: 'run_doxygen_sphinx.sh.in',
diff --git a/doc/sphinx/run_doxygen_sphinx.sh.in b/doc/sphinx/run_doxygen_sphinx.sh.in
index 79f171b3..1a28f0ab 100755
--- a/doc/sphinx/run_doxygen_sphinx.sh.in
+++ b/doc/sphinx/run_doxygen_sphinx.sh.in
@@ -1,2 +1,9 @@
 #!/bin/sh
-@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ -E -W -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
+
+if [ "@MESON_WERROR@" = "YES" ]; then
+	SPHINX_WERROR="-W"
+else
+	SPHINX_WERROR=""
+fi
+
+@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ $SPHINX_WERROR -E -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@