diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1963944ee4c..0f88cff0010 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -119,38 +119,10 @@ New Features
 Bug Fixes
 ----------------------
 
-* SOLR-5904: ElectionContext can cancel an election when it should not if there
-  was an exception while trying to register as the leader. 
-  (Mark Miller, Alan Woodward)
-
-* SOLR-5993: ZkController can warn about shard leader conflict even after the conflict
-  is resolved. (Gregory Chanan via shalin)
-
 * SOLR-6002: Fix a couple of ugly issues around SolrIndexWriter close and 
   rollback as well as how SolrIndexWriter manages it's ref counted directory
   instance. (Mark Miller, Gregory Chanan)
 
-* SOLR-6017: Fix SimpleQParser to use query analyzer instead of index analyzer.
-  (Ryan Ernst)
-
-* SOLR-6029: CollapsingQParserPlugin throws ArrayIndexOutOfBoundsException
-  if elevated doc has been deleted from a segment. (Greg Harris, Joel Bernstein)
-
-* SOLR-6030: Use System.nanoTime() instead of currentTimeInMills() in LRUCache.warm.
-  (Tomás Fernández Löbbe via shalin)
-
-* SOLR-6037: Fixed incorrect max/sum/stddev for Date fields in StatsComponent
-  (Brett Lucey, hossman)
-
-* SOLR-6023: FieldAnalysisRequestHandler throws NPE if no parameters are supplied.
-  (shalin)
-  
-* SOLR-5090: SpellCheckComponent sometimes throws NPE if 
-  "spellcheck.alternativeTermCount" is set to zero (James Dyer).
-
-* SOLR-6039: fixed debug output when no results in response
-  (Tomás Fernández Löbbe, hossman)
-
 Other Changes
 ---------------------
 
@@ -188,24 +160,40 @@ Build
 
 ==================  4.8.1 ==================
 
-Versions of Major Components
----------------------
-Apache Tika 1.5
-Carrot2 3.9.0
-Velocity 1.7 and Velocity Tools 2.0
-Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.6
-
 Bug Fixes
 ----------------------
 
-* SOLR-6029: CollapsingQParserPlugin throws ArrayIndexOutOfBoundsException 
+* SOLR-5904: ElectionContext can cancel an election when it should not if there
+  was an exception while trying to register as the leader. 
+  (Mark Miller, Alan Woodward)
+
+* SOLR-5993: ZkController can warn about shard leader conflict even after the conflict
+  is resolved. (Gregory Chanan via shalin)
+
+* SOLR-6017: Fix SimpleQParser to use query analyzer
+  (Ryan Ernst)
+
+* SOLR_6029: CollapsingQParserPlugin throws ArrayIndexOutOfBoundsException
   if elevated doc has been deleted from a segment. (Greg Harris, Joel Bernstein)
 
+* SOLR-6030: Use System.nanoTime() instead of currentTimeInMills() in LRUCache.warm.
+  (Tomás Fernández Löbbe via shalin)
+
+* SOLR-6037: Fixed incorrect max/sum/stddev for Date fields in StatsComponent
+  (Brett Lucey, hossman)
+
+* SOLR-6023: FieldAnalysisRequestHandler throws NPE if no parameters are supplied.
+  (shalin)
+  
+* SOLR-5090: SpellCheckComponent sometimes throws NPE if 
+  "spellcheck.alternativeTermCount" is set to zero (James Dyer).
+
+* SOLR-6039: fixed debug output when no results in response
+  (Tomás Fernández Löbbe, hossman)
+
 * SOLR-6035: CloudSolrServer directUpdate routing should use getCoreUrl.
   (Marvin Justice, Joel Bernstein)
 
-
 ==================  4.8.0 ==================
 
 Versions of Major Components