diff --git a/java/bluej/Makefile b/java/bluej/Makefile
index 5e9667ea11e9..533bea3fb512 100644
--- a/java/bluej/Makefile
+++ b/java/bluej/Makefile
@@ -2,32 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	bluej
-PORTVERSION=	3.0.9
+PORTVERSION=	3.1.1
 CATEGORIES=	java editors
 MASTER_SITES=	http://www.bluej.org/download/files/ \
 		ftp://ftp.bluej.org/pub/bluej/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.jar
-EXTRACT_ONLY=
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Integrated Java environment designed for introductory teaching
 
-IS_INTERACTIVE=	yes
 NO_BUILD=	yes
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
+SUB_FILES=	bluej
+
+post-extract:
+	@${MKDIR} ${WRKSRC}
+	@${TAR} -xf ${WRKDIR}/bluej-dist.jar -C ${WRKSRC}
 
 do-install:
-	@${ECHO} Starting BlueJ graphical installer...  
-	@${ECHO} Please install to default path of
-	@${ECHO} ${STAGEDIR}${PREFIX}/bluej.
-	@${ECHO} Close the installer when done.
-	@cd ${STAGEDIR}${PREFIX}; ${JAVA_HOME}/bin/java \
-		-jar ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-	-@${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	@${LN} -sf ${STAGEDIR}${PREFIX}/bluej/bluej \
-		${STAGEDIR}${PREFIX}/bin/bluej
+	${MKDIR} ${STAGEDIR}${PREFIX}/bluej
+	cd ${WRKSRC}; ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/bluej
+	${INSTALL_SCRIPT} ${WRKDIR}/bluej ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/java/bluej/distinfo b/java/bluej/distinfo
index 404198882d04..384537a4e1d3 100644
--- a/java/bluej/distinfo
+++ b/java/bluej/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluej-309.jar) = 380a19fdee2ef45dd719985647772937e2b6e089ad57714216d50574eeac4742
-SIZE (bluej-309.jar) = 6008268
+SHA256 (bluej-311.jar) = 83d1a83a43fc812cfcd5037271dbdab604d126ae5df947eeb5c9a5181700e7f5
+SIZE (bluej-311.jar) = 6687253
diff --git a/java/bluej/files/bluej.in b/java/bluej/files/bluej.in
new file mode 100644
index 000000000000..95eb2877b853
--- /dev/null
+++ b/java/bluej/files/bluej.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+APPBASE="%%PREFIX%%/bluej"
+CP="$APPBASE/lib/bluej.jar"
+java -Dawt.useSystemAAFontSettings=on -cp "$CP" bluej.Boot  "$@"
diff --git a/java/bluej/pkg-plist b/java/bluej/pkg-plist
index 6e4f897afcae..2c3831017f98 100644
--- a/java/bluej/pkg-plist
+++ b/java/bluej/pkg-plist
@@ -2,7 +2,6 @@ bin/bluej
 bluej/LICENSE.txt
 bluej/README.TXT
 bluej/THIRDPARTYLICENSE.txt
-bluej/bluej
 bluej/examples/appletdemo/CaseConverter.java
 bluej/examples/appletdemo/README.TXT
 bluej/examples/appletdemo/package.bluej
@@ -110,6 +109,7 @@ bluej/lib/chinese/templates/newclass/interface.tmpl
 bluej/lib/chinese/templates/newclass/stdclass.tmpl
 bluej/lib/chinese/templates/newclass/unittest.tmpl
 bluej/lib/chinese/templates/readme.tmpl
+bluej/lib/commons-logging-api-1.1.2.jar
 bluej/lib/czech/bluejparser.help
 bluej/lib/czech/dialogues
 bluej/lib/czech/exception.help
@@ -147,6 +147,7 @@ bluej/lib/danish/templates/newclass/interface.tmpl
 bluej/lib/danish/templates/newclass/stdclass.tmpl
 bluej/lib/danish/templates/newclass/unittest.tmpl
 bluej/lib/danish/templates/readme.tmpl
+bluej/lib/diffutils-1.2.1.jar
 bluej/lib/dutch/dialogues
 bluej/lib/dutch/exception.help
 bluej/lib/dutch/javac.help
@@ -197,6 +198,7 @@ bluej/lib/french/templates/newclass/abstract.tmpl
 bluej/lib/french/templates/newclass/appletj.tmpl
 bluej/lib/french/templates/newclass/enum.tmpl
 bluej/lib/french/templates/newclass/interface.tmpl
+bluej/lib/french/templates/newclass/midlet.tmpl
 bluej/lib/french/templates/newclass/stdclass.tmpl
 bluej/lib/french/templates/newclass/unittest.tmpl
 bluej/lib/french/templates/readme.tmpl
@@ -233,6 +235,10 @@ bluej/lib/greek/templates/newclass/interface.tmpl
 bluej/lib/greek/templates/newclass/stdclass.tmpl
 bluej/lib/greek/templates/newclass/unittest.tmpl
 bluej/lib/greek/templates/readme.tmpl
+bluej/lib/httpclient-4.1.1.jar
+bluej/lib/httpcore-4.1.jar
+bluej/lib/httpmime-4.1.1.jar
+bluej/lib/images/Weather.png
 bluej/lib/images/about-logo.jpg
 bluej/lib/images/arrow_black_uml.gif
 bluej/lib/images/bluej-icon-256.png