diff --git a/graphics/yed/Makefile b/graphics/yed/Makefile
index cdc6c40256db..25ade9a66231 100644
--- a/graphics/yed/Makefile
+++ b/graphics/yed/Makefile
@@ -1,7 +1,7 @@
 # Created by: Eugene Mychlo <myc@barev.net>
 
 PORTNAME=	yed
-DISTVERSION=	3.20.1
+DISTVERSION=	3.21.1
 CATEGORIES=	graphics java
 MASTER_SITES=	#
 DISTNAME=	yEd-${DISTVERSION}
@@ -18,14 +18,18 @@ LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
-NO_BUILD=	yes
-NO_ARCH=	yes
+
 RESTRICTED=	Downloading requires acceptance of license agreement
+
 DESKTOP_ENTRIES="yEd" "${COMMENT}" "" "yed" "Graphics;" false
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 SUB_FILES=	${PORTNAME}
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+
+NO_BUILD=	yes
+NO_ARCH=	yes
 
 DOWNLOAD_URL?=	http://www.yworks.com/downloads\#yEd
 
diff --git a/graphics/yed/distinfo b/graphics/yed/distinfo
index 7f7e4a79854f..3ecf89ada202 100644
--- a/graphics/yed/distinfo
+++ b/graphics/yed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601150519
-SHA256 (yEd-3.20.1.zip) = f1b8c878e45d476fd99e950c3469e7d7d9b433dab4efad8c1f8938dec9e2d897
-SIZE (yEd-3.20.1.zip) = 36979768
+TIMESTAMP = 1617309945
+SHA256 (yEd-3.21.1.zip) = c4301c2d7e842bdb781b6a112c74e1244d1b80eb0eeb8a0a30e1bfba83ef09e4
+SIZE (yEd-3.21.1.zip) = 36128103
diff --git a/graphics/yed/files/yed.in b/graphics/yed/files/yed.in
index a16eb26149a2..9fa0b4daf181 100644
--- a/graphics/yed/files/yed.in
+++ b/graphics/yed/files/yed.in
@@ -1,11 +1,3 @@
 #!/bin/sh
 
-#: ${JAVA_HOME=%%PREFIX%%/openjdk8}
-JAVA_HOME=%%PREFIX%%/openjdk8
-
-if [ ! -x ${JAVA_HOME}/bin/java ]; then
-	echo "No java distribution in ${JAVA_HOME}"
-	exit 1
-fi
-
-exec java -Dawt.useSystemAAFontSettings=on -jar %%DATADIR%%/yed.jar
+exec %%JAVA_HOME%%/bin/java -Dawt.useSystemAAFontSettings=on -jar %%DATADIR%%/yed.jar "$@"