diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c025e1..8dacd71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,9 @@ project adheres to [Semantic Versioning].
 
 ### Fixed
 
+- Fix the Java highlight for the `val` keyword within lambdas bodies. This fix
+  should also have fix the highlight of `val` in other snippets of Java code.
+
 - Fix the Java highlight for nested class names in `import` statements.
 
 ## [0.4.0] - 2019-08-02
diff --git a/after/syntax/java.vim b/after/syntax/java.vim
index 633d721..5f9827b 100644
--- a/after/syntax/java.vim
+++ b/after/syntax/java.vim
@@ -49,6 +49,7 @@ syntax match   javaOdysseyClassMethodRef  "\<\u\w*\>::"me=e-2 containedin=javaPa
 syntax region  javaOdysseyComment         start=+/\*+ end=+\*/+ transparent fold keepend
 syntax region  javaOdysseyImport          start=/\%(^import\)\@<=\s.\+;/ end=+^\s*$+ transparent fold keepend
 syntax region  javaOdysseyImportStatic    start=/\%(^import static\)\@<=\s.\+;/ end=+^\s*$+ transparent fold keepend
+syntax cluster javaTop                    add=javaOdysseyLombok
 
 " }}}
 " vim: foldmethod=marker