diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index 5b612b6e5cd..0148cb3df7f 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -1,8 +1,8 @@
 COMMENT=		Scheme and language framework for the Java platform
 
 DISTNAME=		kawa-3.1.1
-CATEGORIES=		lang java
-REVISION=		1
+CATEGORIES=		lang
+REVISION=		2
 
 HOMEPAGE=		https://www.gnu.org/software/kawa/
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE=	Yes
 SITES=			${SITE_GNU:=kawa/}
 
 MODULES=		java
-MODJAVA_VER=		1.8+
+MODJAVA_VER=		11
 
 TEST_DEPENDS=		${RUN_DEPENDS}
 
@@ -26,32 +26,33 @@ BUILD_DEPENDS=		print/texinfo \
 			${MODGNU_AUTOCONF_DEPENDS} \
 			${MODGNU_AUTOMAKE_DEPENDS}
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--enable-kawa-frontend
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS+=	--enable-kawa-frontend \
+			--with-java-source=11
 CONFIGURE_ENV+=		AUTOMAKE=${LOCALBASE}/bin/automake-1.16 \
 			AUTOCONF=${LOCALBASE}/bin/autoconf-2.69
 
 MAKE_FLAGS=		JAVAC=${JAVA_HOME}/bin/javac \
 			JAVA=${JAVA_HOME}/bin/java \
+			JAR=${JAVA_HOME}/bin/jar \
 			MAKEINFO=${LOCALBASE}/bin/gmakeinfo \
 			AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
 
-MAKE_ENV+=		SLIB_JAVAFLAGS=-Xmx1200M
-
 # use UTF-8 encoding to avoid following errors:
 # unmappable character for encoding ASCII
 MAKE_ENV+=		LANG=en_US.UTF-8
 
+SUBST_VARS+=		JAVA_HOME
+
 TEST_FLAGS =		DIFF=diff \
 			PATH=${PATH}:${JAVA_HOME}/bin
 
-# Use a bit complex xargs avoid unneeded modifications to files
-# causing build issues on i386.
 pre-patch:
-	find ${WRKSRC} -type f -exec fgrep -l "JAR =" {} + | \
-		xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \
-		touch ${WRKSRC}/configure.ac
+	touch ${WRKSRC}/configure.ac
 	sed -i 's,/usr/bin,${LOCALBASE}/bin,g' ${WRKDIST}/doc/*.man
 
+post-patch:
+	${SUBST_CMD} ${WRKSRC}/bin/kawa.c
+
 .include <bsd.port.mk>
diff --git a/lang/kawa/patches/patch-bin_kawa_c b/lang/kawa/patches/patch-bin_kawa_c
new file mode 100644
index 00000000000..a548baa1a13
--- /dev/null
+++ b/lang/kawa/patches/patch-bin_kawa_c
@@ -0,0 +1,14 @@
+Run with java depend (don't require java in path).
+
+Index: bin/kawa.c
+--- bin/kawa.c.orig
++++ bin/kawa.c
+@@ -517,7 +517,7 @@ main(int argc, char** argv)
+   out_argv[out_argc++] = get_command (argv[0]);
+ #else
+   putenv (get_classpath(argv[0]));
+-  out_argv[out_argc++] = "java";
++  out_argv[out_argc++] = "${JAVA_HOME}/bin/java";
+ #endif
+ 
+   /* Calculate and set the kawa.command.line property. */
diff --git a/lang/kawa/patches/patch-gnu_kawa_slib_Makefile_in b/lang/kawa/patches/patch-gnu_kawa_slib_Makefile_in
deleted file mode 100644
index 2bf35fef2b7..00000000000
--- a/lang/kawa/patches/patch-gnu_kawa_slib_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-Fails to compile swing.scm with defaults on some arch.
-
---- gnu/kawa/slib/Makefile.in.orig	Thu Feb  9 21:03:27 2017
-+++ gnu/kawa/slib/Makefile.in	Thu Feb  9 21:03:41 2017
-@@ -140,7 +140,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--JAVA = @JAVA@
-+JAVA = @JAVA@ ${SLIB_JAVAFLAGS}
- JAVAC = @JAVAC@
- JAVACFLAGS = @JAVACFLAGS@
- JAVA_SOURCE = @JAVA_SOURCE@
diff --git a/lang/kawa/patches/patch-testsuite_Makefile_am b/lang/kawa/patches/patch-testsuite_Makefile_am
new file mode 100644
index 00000000000..eebec835b4f
--- /dev/null
+++ b/lang/kawa/patches/patch-testsuite_Makefile_am
@@ -0,0 +1,22 @@
+Skip tests using jaxb which was removed in jdk11
+
+Index: testsuite/Makefile.am
+--- testsuite/Makefile.am.orig
++++ testsuite/Makefile.am
+@@ -18,7 +18,7 @@ SERVLET_TESTS = check-HelloCgiS check-HelloCgiK
+ endif
+ endif
+ if WITH_SAX2
+-SAX2_TESTS = check-MySAXApp check-jaxb-annotations3
++SAX2_TESTS = check-MySAXApp
+ endif
+ 
+ WARN_FLAGS = --warn-undefined-variable --warn-invoke-unknown-method --warn-as-error
+@@ -48,7 +48,6 @@ check1:  check-num check-arr check-java-array check-la
+   check-srfi-101 check-srfi-108 check-srfi-109 check-resolve-uri \
+   check-format check-ppfile check-system check-strings check-text check-regex \
+   check-xml scribble.class check-run-test-scripts check-moduleM \
+-  check-annotations1 check-annotations2\
+   check-binarytrees check-chameneosredux check-fannkuch check-fannkuchredux check-fasta \
+   check-knucleotide check-mandelbrot check-meteor check-nbody \
+   check-nsieve check-pidigits check-regexdna check-revcomp \