diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build
index 87153a2bd..2d17be938 100644
--- a/doc/sphinx/meson.build
+++ b/doc/sphinx/meson.build
@@ -48,7 +48,7 @@ doxygen_conf_weston = configure_file(
 
 script_data = configuration_data()
 script_data.set('SRCDIR', meson.current_build_dir())
-script_data.set('OUTDIR', meson.current_build_dir() + '/doc')
+script_data.set('OUTDIR', meson.current_build_dir() / 'weston')
 
 # Set a different directory for doctrees to avoid installing them
 script_data.set('DOCTREES_DIR', meson.current_build_dir() + '/doctrees')
@@ -82,9 +82,11 @@ endif
 sphinx_doc = custom_target(
 		'weston-doc-breathe',
 		command: script_doxy_sphinx,
-		output: 'doc',
+		output: 'weston',
 		build_by_default: true,
 		env: sphinx_env,
+		install: true,
+		install_dir: dir_data / 'doc',
 )
 
 # we need this because we will have a stale 'doc' directory
@@ -93,10 +95,3 @@ docs = run_target(
 		'docs',
 		command: script_doxy_sphinx,
 )
-
-install_subdir(
-	sphinx_doc.full_path(),
-	install_dir: dir_data / 'doc' / 'weston',
-	exclude_files: '.buildinfo',
-	strip_directory: true,
-)
diff --git a/doc/sphinx/run_doxygen_sphinx.sh.in b/doc/sphinx/run_doxygen_sphinx.sh.in
index 1a28f0ab5..e1a1010c5 100755
--- a/doc/sphinx/run_doxygen_sphinx.sh.in
+++ b/doc/sphinx/run_doxygen_sphinx.sh.in
@@ -6,4 +6,15 @@ else
 	SPHINX_WERROR=""
 fi
 
-@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ $SPHINX_WERROR -E -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
+set -e
+
+BUILDINFO_ORIG="@OUTDIR@/.buildinfo"
+BUILDINFO_SAVE="@SRCDIR@/buildinfo.save"
+
+[ -f "$BUILDINFO_SAVE" ] && mv -f "$BUILDINFO_SAVE" "$BUILDINFO_ORIG"
+
+@DOXYGEN_CMD@ @DOXYGEN_CONF@
+
+@SPHINX_CMD@ $SPHINX_WERROR -E -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
+
+mv -f "$BUILDINFO_ORIG" "$BUILDINFO_SAVE"