diff --git a/CHANGES.md b/CHANGES.md
index 9968ab83be..d84c96801a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -82,6 +82,7 @@ Core Grammars:
 - enh(css) add `select`, `option`, `optgroup`, `picture` and `source` to list of known tags [Vasily Polovnyov][]
 - enh(css) add `inset`, `inset-*`, `border-start-*-radius` and `border-end-*-radius` attributes [Vasily Polovnyov][]
 - enh(css) add `text-decoration-skip-ink`, `text-decoration-thickness` and `text-underline-offset` attributes [Vasily Polovnyov][]
+- enh(java) add `when` to be recognized as a keyword in Java [Chiel van de Steeg][]
 
 New Grammars:
 
@@ -140,6 +141,7 @@ Themes:
 [Julien Bloino]: https://github.com/jbloino
 [Sierra]: https://github.com/casuallyblue
 [Vlad Dimov]: https://github.com/DevDimov
+[Chiel van de Steeg]: https://github.com/cvdsteeg
 
 
 
diff --git a/src/languages/java.js b/src/languages/java.js
index a0e5d4cf9a..b826eb94cf 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -75,7 +75,8 @@ export default function(hljs) {
     'sealed',
     'yield',
     'permits',
-    'goto'
+    'goto',
+    'when'
   ];
 
   const BUILT_INS = [