diff --git a/manual/luatex-nodes.tex b/manual/luatex-nodes.tex
index 7d19d7713c7bc3b38fedd7dccda6a9fed14690a3..821942a9ac432b7df19bf63b274f43863ceae4ce 100644
--- a/manual/luatex-nodes.tex
+++ b/manual/luatex-nodes.tex
@@ -1879,7 +1879,6 @@ this:
 \NC \type {set_attribute}        \NC \yes \NC \yes  \NC \NR
 \NC \type {setboth}              \NC \yes \NC \yes  \NC \NR
 \NC \type {setbox}               \NC \nop \NC \yes  \NC \NR
-\NC \type {setbox}               \NC \yes \NC \yes  \NC \NR
 \NC \type {setchar}              \NC \yes \NC \yes  \NC \NR
 \NC \type {setdisc}              \NC \yes \NC \yes  \NC \NR
 \NC \type {setfield}             \NC \yes \NC \yes  \NC \NR
diff --git a/manual/luatex.pdf b/manual/luatex.pdf
index 52b3e046f600af55207788788b5d0bbd3aeb8e58..fc896f73d8fe3989d39fc08fcec7295083abc6f3 100644
Binary files a/manual/luatex.pdf and b/manual/luatex.pdf differ
diff --git a/source/texk/web2c/luatexdir/pdf/pdfgen.w b/source/texk/web2c/luatexdir/pdf/pdfgen.w
index bb3d47af670f382083b6cc205a6a77857e753174..2b081e21e03054786149a421751ae702c81d1dcf 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -284,9 +284,13 @@ void fix_pdf_minorversion(PDF pdf)
         /* Check that variables for \.{PDF} output are unchanged */
         if (pdf->minor_version != pdf_minor_version)
             normal_error("pdf backend", "minorversion cannot be changed after data is written to the PDF file");
-        if (pdf->draftmode != draft_mode_par)
-            normal_error("pdf backend", "draftmode cannot be changed after data is written to the PDF file");
     }
+}
+
+static void fix_pdf_draftmode(PDF pdf)
+{
+    if (pdf->draftmode != draft_mode_par)
+        normal_error("pdf backend", "draftmode cannot be changed after data is written to the PDF file");
     if (pdf->draftmode != 0) {
         pdf->compress_level = 0;        /* re-fix it, might have been changed inbetween */
         pdf->objcompresslevel = 0;
@@ -1025,6 +1029,7 @@ static void ensure_pdf_header_written(PDF pdf)
     /* Initialize variables for \.{PDF} output */
     fix_pdf_minorversion(pdf);
     init_pdf_outputparameters(pdf);
+    fix_pdf_draftmode(pdf);
     /* Write \.{PDF} header */
     pdf_printf(pdf, "%%PDF-1.%d\n", pdf->minor_version);
     /* The next blob will be removed 1.0. */
diff --git a/source/texk/web2c/luatexdir/tex/extensions.w b/source/texk/web2c/luatexdir/tex/extensions.w
index feff6e382772e13136feee40d5e3206dda39524b..838c6edcead900cc3651684ce1bde7f02e336d5e 100644
--- a/source/texk/web2c/luatexdir/tex/extensions.w
+++ b/source/texk/web2c/luatexdir/tex/extensions.w
@@ -294,7 +294,6 @@ static void do_resource_pdf(int immediate, int code)
             }
             break;
         case save_image_resource_code:
-            fix_pdf_minorversion(static_pdf);
             scan_pdfximage(static_pdf);
             if (immediate) {
                 pdf_write_image(static_pdf, last_saved_image_index);