diff --git a/dev-tools/es_release_notes.pl b/dev-tools/es_release_notes.pl
index 334920290bc..8ce9d3d2b6c 100755
--- a/dev-tools/es_release_notes.pl
+++ b/dev-tools/es_release_notes.pl
@@ -27,23 +27,25 @@ my $Base_URL   = "https://${Github_Key}api.github.com/repos/";
 my $User_Repo  = 'elastic/elasticsearch/';
 my $Issue_URL  = "http://github.com/${User_Repo}issues/";
 
-my @Groups = qw(
-    breaking deprecation feature
-    enhancement bug regression upgrade non-issue build docs test
+my @Groups = (
+    "breaking", "breaking java", "deprecation", "feature",
+    "enhancement", "bug", "regression", "upgrade", "non-issue", "build",
+    "docs", "test"
 );
 my %Group_Labels = (
-    breaking    => 'Breaking changes',
-    build       => 'Build',
-    deprecation => 'Deprecations',
-    docs        => 'Docs',
-    feature     => 'New features',
-    enhancement => 'Enhancements',
-    bug         => 'Bug fixes',
-    regression  => 'Regressions',
-    test        => 'Tests',
-    upgrade     => 'Upgrades',
-    "non-issue" => 'Non-issue',
-    other       => 'NOT CLASSIFIED',
+    breaking        => 'Breaking changes',
+    'breaking java' => 'Breaking Java changes',
+    build           => 'Build',
+    deprecation     => 'Deprecations',
+    docs            => 'Docs',
+    feature         => 'New features',
+    enhancement     => 'Enhancements',
+    bug             => 'Bug fixes',
+    regression      => 'Regressions',
+    test            => 'Tests',
+    upgrade         => 'Upgrades',
+    "non-issue"     => 'Non-issue',
+    other           => 'NOT CLASSIFIED',
 );
 
 use JSON();
@@ -158,6 +160,7 @@ sub fetch_issues {
 ISSUE:
     for my $issue (@issues) {
         next if $seen{ $issue->{number} } && !$issue->{pull_request};
+
         # uncomment for including/excluding PRs already issued in other versions
         # next if grep {$_->{name}=~/^v2/} @{$issue->{labels}};
         my %labels = map { $_->{name} => 1 } @{ $issue->{labels} };