diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile
index 73a18274dd14..3d0740456e86 100644
--- a/java/jboss2/Makefile
+++ b/java/jboss2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${APP_TITLE:L}
 PORTVERSION= 	2.4.6
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,12 +25,12 @@ APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION}
 LOG_DIR=	${APP_HOME}/log
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
 APP_TITLE=	JBoss
-APP_SHORTNAME=	${PORTNAME}
+APP_SHORTNAME=	${PORTNAME}${PORTVERSION:R:R}
 CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
 CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
 CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
 STARTUP_ORDER=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}.sh
+STARTUP_SCRIPT_NAME=	${APP_SHORTNAME}.sh
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
 USER=		www
 GROUP=		www
diff --git a/java/jboss2/pkg-comment b/java/jboss2/pkg-comment
index 6eb98e51fe50..f8eeed5fba1a 100644
--- a/java/jboss2/pkg-comment
+++ b/java/jboss2/pkg-comment
@@ -1 +1 @@
-JBoss, an open-source J2EE application server
+JBoss 2, an open-source J2EE application server
diff --git a/java/jboss2/pkg-plist b/java/jboss2/pkg-plist
index ea543499ad01..ae413cc1fd9d 100644
--- a/java/jboss2/pkg-plist
+++ b/java/jboss2/pkg-plist
@@ -1,5 +1,5 @@
-bin/jbossctl
-etc/rc.d/020.jboss.sh
+bin/jboss2ctl
+etc/rc.d/020.jboss2.sh
 %%T%%/docs/images/Entity_container_call.gif
 %%T%%/docs/images/confgui.gif
 %%T%%/docs/images/jbossgui.gif
@@ -1119,7 +1119,7 @@ etc/rc.d/020.jboss.sh
 %%T%%/bin/run.jar
 %%T%%/bin/run.sh
 %%T%%/bin/verifier.jar
-man/man1/jbossctl.1
+man/man1/jboss2ctl.1
 @dirrm %%T%%/application-deployments
 @dirrm %%T%%/docs/images
 @dirrm %%T%%/docs/api/org/jboss/mail