diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index c357c0a0975d..057bfc0b9b84 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sweethome3d
 PORTVERSION=	6.4.2
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
diff --git a/cad/sweethome3d/files/sweethome3d.sh.in b/cad/sweethome3d/files/sweethome3d.sh.in
index 98b88265f4d3..1584b6778854 100644
--- a/cad/sweethome3d/files/sweethome3d.sh.in
+++ b/cad/sweethome3d/files/sweethome3d.sh.in
@@ -1,8 +1,6 @@
 #!/bin/sh
-#
-# $FreeBSD$
 
 JAVA="%%LOCALBASE%%/bin/java"
-JARPATH="%%JAVALIBDIR%%"
+SH3D_JAR="%%JAVALIBDIR%%/%%JARNAME%%"
 
-exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@"
+JAVA_VERSION=%%JAVA_VERSION%% exec "${JAVA}" -Xmx1024m -jar "${SH3D_JAR}" "$@"