diff --git a/build.lua b/build.lua
index 8ce39d221..e54dbc4a5 100644
--- a/build.lua
+++ b/build.lua
@@ -12,19 +12,13 @@ docfiledir = "./doc/generic/pgf"
 docfiles =
   {
     "RELEASE_NOTES.md", "description.html", -- Part of the release script
-    "color.cfg", "pgfmanual.cfg", "images/*.jpg", "*.tex" -- Build the PDF
+    "color.cfg", "pgfmanual.cfg", "images", "plots", "*.tex" -- Build the manual
   }
 tdsroot = "generic"
 typesetfiles = {"pgfmanual.tex"}
 typesetexe = "lualatex"
 flatten = false
 
--- To allow writing
-function docinit_hook()
-  mkdir(typesetdir .. "/plots")
-  return 0
-end
-
 -- Set up to allow testing dvips, etc.
 specialformats = specialformats or {}
 specialformats["latex"] = specialformats["latex"] or
diff --git a/doc/generic/pgf/CHANGELOG.md b/doc/generic/pgf/CHANGELOG.md
index b068edb9b..4ee4c2de0 100644
--- a/doc/generic/pgf/CHANGELOG.md
+++ b/doc/generic/pgf/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Typo in animations `end on` key #1273
 - Output bounding box adjustment in pgfsys-dvisvgm.def #1275
 - Fix shadings under LuaMetaTeX
+- Resolve missing `gnuplot` plots in manual #1238
 
 ### Changed
 
@@ -22,6 +23,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Simplify short verb `|...|` or add required preamble for it
 - Harden parser for math expressions against active chars
 - Resolve overfull hboxes >=20pt in the manual
+- Adapt `\graphicspath` setting for flattened doc tree #1191
+- Promote warning "Plot data file \`...' not found" to error
 
 ### Contributors
 
@@ -31,7 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Matthias Hetzenberger
 - Qrrbrbirlbel
 - quark67
-- Yukai Chou (muzimuzhi)
+- Yukai Chou (@muzimuzhi)
 - Alexander Grahn
 
 ## [3.1.10] - 2023-01-13 Henri Menke
diff --git a/doc/generic/pgf/pgfmanual-en-main-preamble.tex b/doc/generic/pgf/pgfmanual-en-main-preamble.tex
index f500f11f4..b5f5b11b1 100644
--- a/doc/generic/pgf/pgfmanual-en-main-preamble.tex
+++ b/doc/generic/pgf/pgfmanual-en-main-preamble.tex
@@ -176,7 +176,7 @@
 % require texlive 2021 or above
 \tracinglostchars=3
 
-\graphicspath{{../../images/}}
+\graphicspath{{images/}}
 \input{pgfmanual-en-macros}
 
 \usepackage{todonotes}
diff --git a/tex/generic/pgf/modules/pgfmoduleplot.code.tex b/tex/generic/pgf/modules/pgfmoduleplot.code.tex
index 0afea0ae3..5135d4eec 100644
--- a/tex/generic/pgf/modules/pgfmoduleplot.code.tex
+++ b/tex/generic/pgf/modules/pgfmoduleplot.code.tex
@@ -332,7 +332,7 @@
     \pgfplotstreamstart%
     \openin\r@pgf@reada=#1
     \ifeof\r@pgf@reada
-      \pgfwarning{Plot data file `#1' not found.}
+      \pgferror{Plot data file `#1' not found.}
      \else
       \catcode`\#=14
       \catcode`\^^M=5
@@ -400,7 +400,7 @@
     \pgfplotstreamstart%
     \openin\r@pgf@reada=#1
     \ifeof\r@pgf@reada
-      \pgfwarning{Plot data file `#1' not found.}
+      \pgferror{Plot data file `#1' not found.}
     \else
       \catcode`\#=14
       \catcode`\^^M=5