diff --git a/src/Floating.cpp b/src/Floating.cpp
index 03bde1fe24..8309e79caa 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -44,7 +44,7 @@ Floating::Floating(string const & type, string const & placement,
 string const & Floating::htmlAttrib() const
 {
 	if (html_attrib_.empty())
-		html_attrib_ = "class='float " + defaultCSSClass() + "'";
+		html_attrib_ = "class='" + defaultCSSClass() + "'";
 	return html_attrib_;
 }
 
diff --git a/status.22x b/status.22x
index 89fd9173a2..1b4b5762ec 100644
--- a/status.22x
+++ b/status.22x
@@ -97,6 +97,8 @@ What's new
 
 - Fix output of floats, etc, inside environments (bug 9094).
 
+- Simplify XHTML output for floats, etc (bug 8605).
+
 - Add "dir='auto'" to body tag, which should help a lot with export of
   RTL languages (bug 8279, partly).