diff --git a/runtime/compiler/javac.vim b/runtime/compiler/javac.vim
index f5fe841..9bd4cdf 100644
--- a/runtime/compiler/javac.vim
+++ b/runtime/compiler/javac.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	Java Development Kit Compiler
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2024 Apr 03
+" Last Change:	2024 Jun 14
 
 if exists("current_compiler")
   finish
@@ -11,7 +11,12 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-CompilerSet makeprg=javac
+if exists("g:javac_makeprg_params")
+  execute $'CompilerSet makeprg=javac\ {escape(g:javac_makeprg_params, ' \|"')}'
+else
+  CompilerSet makeprg=javac
+endif
+
 CompilerSet errorformat=%E%f:%l:\ error:\ %m,
 		       \%W%f:%l:\ warning:\ %m,
 		       \%-Z%p^,
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 7f3654c..e2aef24 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 9.1.  Last change: 2024 Jun 09
+*quickfix.txt*  For Vim version 9.1.  Last change: 2024 Jun 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1303,6 +1303,14 @@
 				positives.
 
 
+JAVAC							*compiler-javac*
+
+Commonly used compiler options can be added to 'makeprg' by setting the
+g:javac_makeprg_params variable.  For example: >
+
+	let g:javac_makeprg_params = "-Xlint:all -encoding utf-8"
+<
+
 MANX AZTEC C				*quickfix-manx* *compiler-manx*
 
 To use Vim with Manx's Aztec C compiler on the Amiga you should do the
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 9955f0d..3665fd3 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -6532,6 +6532,7 @@
 compiler-gcc	quickfix.txt	/*compiler-gcc*
 compiler-gnat	ft_ada.txt	/*compiler-gnat*
 compiler-hpada	ft_ada.txt	/*compiler-hpada*
+compiler-javac	quickfix.txt	/*compiler-javac*
 compiler-manx	quickfix.txt	/*compiler-manx*
 compiler-pandoc	quickfix.txt	/*compiler-pandoc*
 compiler-perl	quickfix.txt	/*compiler-perl*