diff --git a/devel/antlrworks/Makefile b/devel/antlrworks/Makefile
index 28e2206e8dce..7ea533f9138b 100644
--- a/devel/antlrworks/Makefile
+++ b/devel/antlrworks/Makefile
@@ -1,51 +1,37 @@
-# New ports collection makefile for:	antlrworks
-# Date created:				December, 5th 2006
-# Whom:					Matthias Sund <m.sund@arcor.de>
+# New ports collection makefile for:    antlrworks
+# Date created:                         December, 5th 2006
+# Whom:                                 Matthias Sund <m.sund@arcor.de>
 #
 # $FreeBSD$
 
 PORTNAME=	antlrworks
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.1
 PORTEPOCH=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr.org/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+EXTRACT_SUFX=	.jar
 
 MAINTAINER=	m.sund@arcor.de
 COMMENT=	The ANTLR GUI Development Environment
 
-USE_ZIP=	yes
-EXTRACT_AFTER_ARGS=	"-d${DISTNAME}"
-
-ONLY_FOR_ARCHS=	i386 amd64
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
-JAVA_OS=	native
-JAVA_RUN=	yes
-
-USE_ANT=	yes
-ALL_TARGET=	build
-
-PLIST_FILES=	bin/antlrworks %%DATADIR%%/antlrworks.jar share/pixmaps/antlrworks.png
-PLIST_DIRS=	%%DATADIR%%
+NO_BUILD=	yes
 
 DESKTOP_ENTRIES="ANTLRWorks" \
-		"ANTLR GUI Development Environment" \
-		"antlrworks.png" \
-		"antlrworks" \
-		"Application;Development;" \
-		true
-
-post-build:
-	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/antlrworks
-	@${ECHO_CMD} "exec java -Xmx400m -jar ${DATADIR}/antlrworks.jar" >> ${WRKSRC}/antlrworks
+	"ANTLR GUI Development Environment" \
+	"antlrworks.png" \
+	"antlrworks" \
+	"Application;Development;" \
+	true
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/antlrworks ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/antlrworks-${PORTVERSION}.jar ${DATADIR}/antlrworks.jar
-	${MKDIR} ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/src/aw/org/antlr/works/icons/app_32x32.png ${PREFIX}/share/pixmaps/antlrworks.png
+	@${MKDIR} ${JAVASHAREDIR}/${PORTNAME}
+	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.jar ${JAVASHAREDIR}/${PORTNAME}/${DISTNAME}.jar
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/antlrworks
+	@${ECHO_CMD} "exec java -Xmx400m -jar ${JAVASHAREDIR}/${PORTNAME}/${DISTNAME}.jar" >> ${WRKDIR}/antlrworks
+	@${INSTALL_SCRIPT} ${WRKDIR}/antlrworks ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	@${INSTALL_DATA} ${WRKDIR}/icons/app_32x32.png ${PREFIX}/share/pixmaps/antlrworks.png
 
 .include <bsd.port.mk>
diff --git a/devel/antlrworks/distinfo b/devel/antlrworks/distinfo
index e94880796002..fcf6fc67d84d 100644
--- a/devel/antlrworks/distinfo
+++ b/devel/antlrworks/distinfo
@@ -1,3 +1,3 @@
-MD5 (antlrworks-1.2.2-src.zip) = bad08d48d1cb1713731ccd3ad0ed5c55
-SHA256 (antlrworks-1.2.2-src.zip) = f5f5ff14228170d17c7330e760de82e0087ee2b12205cc11d424f26ae0b0d81f
-SIZE (antlrworks-1.2.2-src.zip) = 2204349
+MD5 (antlrworks-1.3.1.jar) = 35d52e00f054f02f17f08cbf9149681d
+SHA256 (antlrworks-1.3.1.jar) = e623449c2ca8d220e7e4cac9783a3f9e24a742c5f136cccbd23a356e1f46fc4f
+SIZE (antlrworks-1.3.1.jar) = 3155789
diff --git a/devel/antlrworks/pkg-plist b/devel/antlrworks/pkg-plist
new file mode 100644
index 000000000000..5879e3013bc6
--- /dev/null
+++ b/devel/antlrworks/pkg-plist
@@ -0,0 +1,4 @@
+bin/antlrworks
+%%JAVASHAREDIR%%/antlrworks/antlrworks-1.3.1.jar
+share/pixmaps/antlrworks.png
+@dirrm %%JAVASHAREDIR%%/antlrworks