diff --git a/devel/libmatthew/Makefile b/devel/libmatthew/Makefile
index e0eec3a5eb44..6f732dcbcae4 100644
--- a/devel/libmatthew/Makefile
+++ b/devel/libmatthew/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	libmatthew
 DISTVERSION=	0.8.1
 PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.matthew.ath.cx/projects/java/
 DISTNAME=	${PORTNAME}-java-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Selection of Java libraries by Matthew Johnson
 WWW=		http://www.matthew.ath.cx/projects/java/
 
 LICENSE=	EXPAT
 LICENSE_NAME=	Expat License
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		gmake java localbase:ldconfig
+USES=		gmake java:build localbase:ldconfig
 USE_LDCONFIG=	yes
 
 MAKE_ENV=	JARDIR=${JAVAJARDIR} \
 		JAVA_HOME=${JAVA_HOME} \
 		LDSHAREFLAGS='-fpic -shared' \
 		LIBDIR=${PREFIX}/lib
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*-java.so
 
 .include <bsd.port.mk>
diff --git a/devel/libmatthew/files/patch-Makefile b/devel/libmatthew/files/patch-Makefile
index 2268ea18f91f..71ea3c696ade 100644
--- a/devel/libmatthew/files/patch-Makefile
+++ b/devel/libmatthew/files/patch-Makefile
@@ -1,32 +1,33 @@
 --- Makefile.orig	2018-05-05 20:58:21 UTC
 +++ Makefile
-@@ -6,13 +6,12 @@ JPPFLAGS+=-C -P
+@@ -6,13 +6,13 @@ JPPFLAGS+=-C -P
  CC?=gcc
  LD?=gcc
  JPPFLAGS+=-C -P
 -CFLAGS+=-Wall -Os -pedantic -Werror
 +CFLAGS+=-Wall -pedantic -Werror
  CSTD?=-std=c99
  CSHAREFLAG+=-fpic -fno-stack-protector
  GCJJNIFLAG=-fjni
 -JVERCFLAGS+=-source 1.5
++JVERCFLAGS+=-source 8 -target 8
  JCFLAGS+=
 -INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 +INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd
  JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
  
  LDVER?=$(shell ld -v | cut -d' ' -f1)
-@@ -91,11 +90,11 @@ debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Deb
+@@ -91,11 +91,11 @@ debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Deb
  	tar zcf $@ libmatthew-java-$(MATTVER)
  
  debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
 -	make .enabledebug
 +	$(MAKE) .enabledebug
  	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
  	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
  debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
 -	make .disabledebug
 +	$(MAKE) .disabledebug
  	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
  	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
  .enabledebug: cx/ath/matthew/debug/Debug.jpp