---
 texmf-dist/tex/generic/config/pdftexconfig-paper.tex |   13 +++++++++++++
 texmf-dist/tex/generic/config/pdftexconfig.tex       |   12 ++----------
 tlpkg/texlive.tlpdb                                  |    1 +
 3 files changed, 16 insertions(+), 10 deletions(-)

--- /dev/null
+++ texlive-base-2015.20151116/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
@@ -0,0 +1,13 @@
+% paper size settings, included from pdftexconfig.tex for pdftex
+%
+% In 2015, a new luatex replaced \pdfpage{width,height} with just
+% \page{width,height}, and it might be prefixed with \luatex.  So set
+% any that may be defined.
+\ifx\luatexpagewidth\undefined\else \luatexpagewidth=210 true mm \fi
+\ifx\pdfpagewidth\undefined\else \pdfpagewidth=210 true mm \fi
+\ifx\pagewidth\undefined\else \pagewidth=210 true mm \fi
+%
+\ifx\luatexpageheight\undefined\else \luatexpageheight=297 true mm \fi
+\ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
+\ifx\pageheight\undefined\else \pageheight=297 true mm \fi
+\endinput
--- texlive-base-2015.20151116.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
+++ texlive-base-2015.20151116/texmf-dist/tex/generic/config/pdftexconfig.tex
@@ -3,16 +3,8 @@
 % Thomas Esser, 2004. public domain.
 \pdfoutput=1
 %
-% In 2015, a new luatex replaced \pdfpage{width,height} with just
-% \page{width,height}, and it might be prefixed with \luatex.  So set
-% any that may be defined.
-\ifx\luatexpagewidth\undefined\else \luatexpagewidth=210 true mm \fi
-\ifx\pdfpagewidth\undefined\else \pdfpagewidth=210 true mm \fi
-\ifx\pagewidth\undefined\else \pagewidth=210 true mm \fi
-%
-\ifx\luatexpageheight\undefined\else \luatexpageheight=297 true mm \fi
-\ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
-\ifx\pageheight\undefined\else \pageheight=297 true mm \fi
+% pdftex paper settings are in pdftexconfig-paper.tex
+\input pdftexconfig-paper.tex
 %
 % Other settings.
 \pdfcompresslevel=9
--- texlive-base-2015.20151116.orig/tlpkg/texlive.tlpdb
+++ texlive-base-2015.20151116/tlpkg/texlive.tlpdb
@@ -160593,6 +160593,7 @@
  texmf-dist/scripts/simpdftex/simpdftex
  texmf-dist/tex/generic/config/pdftex-dvi.tex
  texmf-dist/tex/generic/config/pdftexconfig.tex
+ texmf-dist/tex/generic/config/pdftexconfig-paper.tex
  texmf-dist/tex/generic/pdftex/glyphtounicode.tex
  texmf-dist/tex/generic/pdftex/pdfcolor.tex
 catalogue-date 2015-08-03 05:43:12 +0200
