diff --git a/manual/luatex-modifications.tex b/manual/luatex-modifications.tex
index 2545be8cb00696671a7d4ee5e8383a1320a26f5f..0507a56e0fa4e80d2cec752a81ebb94f0a7253df 100644
--- a/manual/luatex-modifications.tex
+++ b/manual/luatex-modifications.tex
@@ -66,6 +66,8 @@ most still comes from the original. But we divert a bit.
     The upper limit to \type {\endlinechar} and \type {\newlinechar} is 127.
 \stopitem
 
+\startitem
+    Magnification (\type {\mag}) is only supported in \DVI\ output mode.
 \stopitemize
 
 \stopsubsection
diff --git a/manual/luatex.pdf b/manual/luatex.pdf
index b3407e20c566ac797a34a1305965f8cc0c4b8be4..9d5d2d0c83b98e2e1580c5ab7853264818dad926 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 f65055ac623ab7ccf5f65de797ee893153c08170..7786d83a1253d7162434d522541ba3dc8a8829bd 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -963,7 +963,6 @@ static void init_pdf_outputparameters(PDF pdf)
     pdf->draftmode = fix_int(int_par(draft_mode_code), 0, 1);
     pdf->compress_level = fix_int(pdf_compress_level, 0, 9);
     pdf->decimal_digits = fix_int(pdf_decimal_digits, 3, 5);
-/*    pdf->decimal_digits = fix_int(pdf_decimal_digits, 3, 6);*//* later, maybe (LS)*/
     pdf->gamma = fix_int(pdf_gamma, 0, 1000000);
     pdf->image_gamma = fix_int(pdf_image_gamma, 0, 1000000);
     pdf->image_hicolor = fix_int(pdf_image_hicolor, 0, 1);
@@ -1693,7 +1692,6 @@ char *get_resname_prefix(PDF pdf)
 
 void pdf_begin_page(PDF pdf)
 {
-    pdffloat f;
     int xform_attributes;
     scaled form_margin = pdf_xform_margin; /* was one_bp until SVN4066 */
     ensure_output_state(pdf, ST_HEADER_WRITTEN);
@@ -1755,16 +1753,6 @@ void pdf_begin_page(PDF pdf)
     pdf_dict_add_streaminfo(pdf);
     pdf_end_dict(pdf);
     pdf_begin_stream(pdf);
-    if (global_shipping_mode == SHIPPING_PAGE) {
-        /* Adjust transformation matrix for the magnification ratio */
-        if (mag != 1000) {
-            setpdffloat(f, mag, 3);
-            print_pdffloat(pdf, f);
-            pdf_puts(pdf, " 0 0 ");
-            print_pdffloat(pdf, f);
-            pdf_puts(pdf, " 0 0 cm\n");
-        }
-    }
     pos_stack_used = 0; /* start with empty stack */
     if (global_shipping_mode == SHIPPING_PAGE) {
         colorstackpagestart();
diff --git a/source/texk/web2c/luatexdir/pdf/pdfshipout.w b/source/texk/web2c/luatexdir/pdf/pdfshipout.w
index d60b4a0dc75f9e9b4bf2fffd0152fd42fd5c6a11..b867ce2ca8efbc8edfb86e14b88f798a56043147 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfshipout.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfshipout.w
@@ -61,8 +61,9 @@ void ship_out(PDF pdf, halfword p, shipping_mode_e shipping_mode)
         Start sheet {\sl Sync\TeX} information record; we assume that |pdf_output| is
         properly set up.
     */
-    if (int_par(synctex_code))
+    if ((output_mode_used == OMODE_DVI) && int_par(synctex_code)) {
         synctexsheet(mag);
+    }
     pre_callback_id = callback_defined(start_page_number_callback);
     post_callback_id = callback_defined(stop_page_number_callback);
     if ((tracing_output > 0) && (pre_callback_id == 0)) {