diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 405794300d..c1184f2120 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2926,6 +2926,7 @@ lib_layouts_module_files = Split('''
     endnotes.module
     eqs-within-sections.module
     figs-within-sections.module
+    fixltx2e.module
     foottoend.module
     hanging.module
     initials.module
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 493e3318e9..f4ff7ff82a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1098,6 +1098,7 @@ dist_layouts_DATA =\
 	layouts/extletter.layout \
 	layouts/extreport.layout \
 	layouts/figs-within-sections.module \
+	layouts/fixltx2e.module \
 	layouts/foils.layout \
 	layouts/foottoend.module \
 	layouts/frletter.layout \
diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
new file mode 100644
index 0000000000..50a44e73fd
--- /dev/null
+++ b/lib/layouts/fixltx2e.module
@@ -0,0 +1,14 @@
+#\DeclareLyXModule{Fix LaTeX}
+#DescriptionBegin
+#Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX.
+#Those fixes are not part of the LaTeX kernel because of backward compatibility.
+#If you use this module your typeset document may look different
+#when you process it with future LaTeX versions, because fixltx2e may provide
+#more bugfixes in future versions.
+#DescriptionEnd
+
+# Author : Georg Baum <baum@lyx.org>
+
+Format 30
+
+Requires fixltx2e
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index bc19ac5f14..f830f60e48 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -575,7 +575,7 @@ char const * simplefeatures[] = {
 	"framed",
 	"soul",
 	"textcomp",
-	"subscript",
+	"fixltx2e",
 	"pmboxdraw",
 	"bbding",
 	"ifsym",
@@ -823,6 +823,10 @@ string const LaTeXFeatures::getPackages() const
 			    "\\makenomenclature\n";
 	}
 
+	// fixltx2e provides subscript
+	if (mustProvide("subscript") && !isRequired("fixltx2e"))
+		packages << "\\usepackage{subscript}\n";
+
 	return packages.str();
 }