diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index c66d66b3ed..23f1682aeb 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -229,6 +229,13 @@ static docstring const papersizepdf_def = from_ascii(
 	"\\pdfpageheight\\paperheight\n"
 	"\\pdfpagewidth\\paperwidth\n");
 
+static docstring const papersizepdflua_def = from_ascii(
+	"% Backwards compatibility for LuaTeX < 0.90\n"
+	"\\@ifundefined{pageheight}{\\let\\pageheight\\pdfpageheight}\n"
+	"\\@ifundefined{pagewidth}{\\let\\pagewidth\\pdfpagewidth}\n"
+	"\\pageheight\\paperheight\n"
+	"\\pagewidth\\paperwidth\n");
+
 static docstring const cedilla_def = from_ascii(
 	"\\newcommand{\\docedilla}[2]{\\underaccent{#1\\mathchar'30}{#2}}\n"
 	"\\newcommand{\\cedilla}[1]{\\mathpalette\\docedilla{#1}}\n");
@@ -1169,8 +1176,11 @@ docstring const LaTeXFeatures::getMacros() const
 	}
 
 	if (mustProvide("papersize")) {
-		if (runparams_.flavor == OutputParams::LATEX)
+		if (runparams_.flavor == OutputParams::LATEX
+		    || runparams_.flavor == OutputParams::DVILUATEX)
 			macros << papersizedvi_def << '\n';
+		else if  (runparams_.flavor == OutputParams::LUATEX)
+			macros << papersizepdflua_def << '\n';
 		else
 			macros << papersizepdf_def << '\n';
 	}
diff --git a/status.22x b/status.22x
index 327f979cd4..6bcc7a156e 100644
--- a/status.22x
+++ b/status.22x
@@ -63,6 +63,8 @@ What's new
 - Fix error with older versions of the covington package in the
   Linguistics module (bug 10340).
 
+- Fix LaTeX error with recent LuaTeX versions when using landscape.
+
 
 * LYX2LYX