diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 36e99b62c6..8ebb663025 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2628,10 +2628,11 @@ void Tabular::TeXRow(otexstream & os, row_type row,
 	bool ismulticol = false;
 	bool ismultirow = false;
 
-	// The bidi package (loaded by polyglossia) reverses RTL table columns
+	// The bidi package (loaded by polyglossia with XeTeX) reverses RTL table columns
+	// Luabibdi (used by LuaTeX) behaves like classic
 	bool const bidi_rtl =
 		runparams.local_font->isRightToLeft()
-		&& runparams.use_polyglossia;
+		&& runparams.use_polyglossia && runparams.flavor == OutputParams::XETEX;
 	idx_type lastcell =
 		bidi_rtl ? getFirstCellInRow(row) : getLastCellInRow(row);
 
@@ -2829,11 +2830,11 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
 	if (is_tabular_star)
 		os << "@{\\extracolsep{\\fill}}";
 
-	// The bidi package (loaded by polyglossia) swaps the column
+	// The bidi package (loaded by polyglossia with XeTeX) swaps the column
 	// order for RTL (#9686). Thus we use this list.
 	bool const bidi_rtl =
 		runparams.local_font->isRightToLeft()
-		&& runparams.use_polyglossia;
+		&& runparams.use_polyglossia && runparams.flavor == OutputParams::XETEX;
 	list<col_type> columns;
 	for (col_type cl = 0; cl < ncols(); ++cl) {
 		if (bidi_rtl)
diff --git a/status.23x b/status.23x
index d29ff0a4ae..f18ebf3e25 100644
--- a/status.23x
+++ b/status.23x
@@ -70,6 +70,8 @@ What's new
 - Find local bib files when they exist in the same directory as the LyX
   file (bug 11588).
 
+- Fix column order with RTL documents and LuaTeX (part of bug 9686).
+
 
 * USER INTERFACE