diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f0647cb2eca..d7136b74b60 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -538,7 +538,7 @@ Bug Fixes
   (shalin)
   
 * SOLR-6856: Restore ExtractingRequestHandler's ability to capture all HTML tags when
-  parsing (X)HTML. (hossman, ehatcher, Steve Rowe)
+  parsing (X)HTML. (hossman, Uwe Schindler, ehatcher, Steve Rowe)
 
 * SOLR-7024: Improved error messages when java is not found by the bin/solr
   shell script, particularly when JAVA_HOME has an invalid location.
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
index 4484bc50495..fe1ecf59a64 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
@@ -280,7 +280,7 @@ public class SolrContentHandler extends DefaultHandler implements ExtractingPara
       }
     } else {
       for (int i = 0; i < attributes.getLength(); i++) {
-        bldrStack.getLast().append(attributes.getValue(i)).append(' ');
+        bldrStack.getLast().append(' ').append(attributes.getValue(i));
       }
     }
     bldrStack.getLast().append(' ');