diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index e642bdc65c..b94f10639f 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -1390,7 +1390,8 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
 			// effect. (Lgb)
 		}
 		if (cit->second)
-			os << "\n\\newsubfloat{" << from_ascii(fl.floattype()) << "}\n";
+			// The subfig package is loaded later
+			os << "\n\\AtBeginDocument{\\newsubfloat{" << from_ascii(fl.floattype()) << "}}\n";
 	}
 }
 
diff --git a/status.20x b/status.20x
index 0a06762f16..ca6f011e8a 100644
--- a/status.20x
+++ b/status.20x
@@ -54,6 +54,9 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
+- Fix garbage in document export (and maybe other places) by making encoding
+  conversions thread-safe (bug 8854).
+
 - Fix output of ulem commands (underline etc.) which was broken as of
   LyX 2.0.6 (bug 8733).
 
@@ -68,15 +71,14 @@ What's new
 - Fix compilation of documents containing chemical equations and math
   integrals (bug 8731).
 
+- Fix compilation with nested ("sub") custom floats.
+
 - Fix import of CSV-files.
 
 - Added h5 and h6 as HTML tags for Paragraph and Subparagraph.
 
 - Include alt tag when exporting math as images (bug 8746).
 
-- Fix garbage in document export (and maybe other places) by making encoding
-  conversions thread-safe (bug 8854).
-
 
 * USER INTERFACE