diff --git a/textproc/epubcheck/Makefile b/textproc/epubcheck/Makefile
index faf4d06be1c..9e1804055a8 100644
--- a/textproc/epubcheck/Makefile
+++ b/textproc/epubcheck/Makefile
@@ -4,6 +4,7 @@ COMMENT =	EPUB validator
 
 V =		5.3.0
 DISTNAME =	epubcheck-$V
+REVISION =	0
 
 CATEGORIES =	textproc
 
@@ -19,7 +20,7 @@ SITES =			https://github.com/w3c/epubcheck/releases/download/v$V/
 EXTRACT_SUFX =		.zip
 
 MODULES =		java
-MODJAVA_VER =		1.8+
+MODJAVA_VER =		11+
 RUN_DEPENDS =		java/javaPathHelper
 
 NO_BUILD =		Yes
diff --git a/textproc/epubcheck/files/epubcheck b/textproc/epubcheck/files/epubcheck
index 67f9c5b6e2c..ccb5c39639c 100644
--- a/textproc/epubcheck/files/epubcheck
+++ b/textproc/epubcheck/files/epubcheck
@@ -1,2 +1,3 @@
 #!/bin/sh
-`javaPathHelper -c epubcheck` -jar /usr/local/share/epubcheck/epubcheck.jar $@
+JAVACMD=$(javaPathHelper -c epubcheck)
+exec ${JAVACMD} -jar /usr/local/share/epubcheck/epubcheck.jar "$@"