diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index f655d14247b..1aafbf7050a 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -216,7 +216,7 @@ Bug Fixes
   deleted at a later point in time. This could cause short-term disk
   pollution or OOM if in-memory directories are used. (Simon Willnauer)
 
-API Changes:
+API Changes
 
 * LUCENE-5222: Add SortField.needsScores(). Previously it was not possible
   for a custom Sort that makes use of the relevance score to work correctly
diff --git a/lucene/site/changes/changes2html.pl b/lucene/site/changes/changes2html.pl
index fd94f4a13bb..61ac1c11e63 100755
--- a/lucene/site/changes/changes2html.pl
+++ b/lucene/site/changes/changes2html.pl
@@ -113,10 +113,13 @@ for (my $line_num = 0 ; $line_num <= $#lines ; ++$line_num) {
   }
 
   # Section heading: no leading whitespace, initial word capitalized,
-  #                  five words or less, and no trailing punctuation
-  if (    /^([A-Z]\S*(?:\s+\S+){0,4})(?<![-.:;!()])\s*$/
+  #                  five words or less, and no trailing punctuation, 
+  #                  except colons - don't match the one otherwise matching
+  #                  non-section-name by excluding "StandardTokenizer"
+  if (    /^(?!.*StandardTokenizer)([A-Z]\S*(?:\s+\S+){0,4})(?<![-.;!()])\s*$/
       and not $in_major_component_versions_section) {
     my $heading = $1;
+    $heading =~ s/:$//; # Strip trailing colon, if any
     $items = [];
     unless (@releases) {
       $sections = [];