diff --git a/java/gj-jdk11/Makefile b/java/gj-jdk11/Makefile
index eade897e3f31..4bab307104d3 100644
--- a/java/gj-jdk11/Makefile
+++ b/java/gj-jdk11/Makefile
@@ -9,5 +9,6 @@ GJ_WITH_JDK11=	YES
 MASTERDIR=	${.CURDIR}/../gj
 MD5_FILE=	${.CURDIR}/distinfo
 PLIST=		${.CURDIR}/pkg-plist
+PLIST_FILES=	bin/gjc11 bin/gjcr11 bin/gj11
 
 .include "${MASTERDIR}/Makefile"
diff --git a/java/gj-jdk11/pkg-plist b/java/gj-jdk11/pkg-plist
index 9e20417eaafe..b1081b1915d5 100644
--- a/java/gj-jdk11/pkg-plist
+++ b/java/gj-jdk11/pkg-plist
@@ -234,9 +234,6 @@ lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections/TreeSet.class
 lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections/UnsupportedOperationException.class
 lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections/Vector$1.class
 lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections/Vector.class
-bin/gjc11
-bin/gjcr11
-bin/gj11
 @dirrm lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections
 @dirrm lib/gj/%%JDKSUBDIR%%/com/sun/java/util
 @dirrm lib/gj/%%JDKSUBDIR%%/com/sun/java
diff --git a/java/gj/Makefile b/java/gj/Makefile
index 7f779d08811b..10593ae0043c 100644
--- a/java/gj/Makefile
+++ b/java/gj/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gj-${JDKSUBDIR}
+PORTNAME=	gj
 PORTVERSION=	0.6m
 CATEGORIES=	java
 MASTER_SITES=	http://www.cis.unisa.edu.au/~pizza/gj/Distribution/
+PKGNAMESUFFIX=	-${JDKSUBDIR}
 DISTNAME=	gjdist${GJDIST}
 
 MAINTAINER=	vs@FreeBSD.org
@@ -17,18 +18,20 @@ COMMENT=	Extension of the Java programming language that supports generic types
 WRKSRC=		${WRKDIR}/gj
 
 NO_BUILD=	YES
+USE_JAVA=	yes
 
 .if defined(GJ_WITH_JDK11)
 GJDIST=		1.1
-USE_JAVA=	1.1
 BINSUFX=	11
+JAVA_VERSION=	1.1
 .else
 GJDIST=		1.2
-USE_JAVA=	1.2+
+JAVA_VERSION=	1.2+
 .endif
 
 JDKSUBDIR=	jdk${GJDIST}
 PLIST_SUB+=	JDKSUBDIR=${JDKSUBDIR}
+PLIST_FILES?=	bin/gjc bin/gjcr bin/gj
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/gj/${JDKSUBDIR}
diff --git a/java/gj/pkg-plist b/java/gj/pkg-plist
index d2e3c51eeb9d..11b7819a72bb 100644
--- a/java/gj/pkg-plist
+++ b/java/gj/pkg-plist
@@ -356,7 +356,4 @@ lib/gj/%%JDKSUBDIR%%/java/util/Vector.class
 @dirrm lib/gj/%%JDKSUBDIR%%/java/util
 @dirrm lib/gj/%%JDKSUBDIR%%/java
 @dirrm lib/gj/%%JDKSUBDIR%%
-@dirrm lib/gj
-bin/gjc
-bin/gjcr
-bin/gj
+@unexec rmdir %D/lib/gj 2>/dev/null || true