diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9aaf6e..b88f558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,17 @@ project adheres to [Semantic Versioning].
 
 ### Changed
 
+- The highlighting of the Javadoc is prevent by default. If the user wants to
+  enable it, the following must be added to the `.vimrc` file:
+
+  ```
+  let g:odyssey_java_javadoc = 1
+  colorscheme odyssey
+  ```
+
+  *Note*: `g:odyssey_java_javadoc` must be different from `0` to enable the
+          highlighting of the Javadoc.
+
 - Change the name of some of the Java syntax group added by the plugin.
 
   + `javaOdysseyImport` becomes `javaOdysseyGetClass`,
diff --git a/colors/odyssey.vim b/colors/odyssey.vim
index b886bd3..d4baaba 100644
--- a/colors/odyssey.vim
+++ b/colors/odyssey.vim
@@ -283,6 +283,14 @@ call s:l(         'javaOdysseyLombok',       'Statement')
 call s:l(      'javaOdysseyEnumValue',        'Constant')
 call s:l('javaOdysseyEnumConstructor',        'Constant')
 
+if exists('g:odyssey_java_javadoc') && g:odyssey_java_javadoc != 0
+  if exists('g:java_ignore_javadoc')
+    unlet g:java_ignore_javadoc
+  end
+else
+  let g:java_ignore_javadoc = 1
+endif
+
 " }}}
 " Ruby Highlights {{{