diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index df55283ec087..1a27e51f6392 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bsh
 PORTVERSION=	2.0.b4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang java
 MASTER_SITES=	http://www.beanshell.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
@@ -21,19 +21,15 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	yes
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JARNAME=${PORTNAME}.jar
 
-PLIST_FILES=	%%DATADIR%%/${PORTNAME}.jar \
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
 		bin/${PORTNAME}
-PLIST_DIRS=	%%DATADIR%%
+PLIST_DIRS=	%%JAVAJARDIR%%
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
-		${DATADIR}/${PORTNAME}.jar
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${JAVAJARDIR}/${PORTNAME}.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>