diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 75de9e13cbf2..08444016fe80 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -7,10 +7,15 @@
 #
 
 PORTNAME=	argouml
-PORTVERSION=	0.16.1
+PORTVERSION=	0.18.1
 CATEGORIES=	devel java
 MASTER_SITES=	http://argouml.tigris.org/files/documents/4/0/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+.if !defined(NOPORTDOCS)
+DISTFILES+=	argomanual-${PORTVERSION}.pdf
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	philip.reynolds@rfc-networks.ie
 COMMENT=	A UML design tool with cognitive support
@@ -20,13 +25,20 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.4+
 
 SUB_FILES=	argouml.sh
+.if !defined(NOPORTDOCS)
+PORTDOCS=	argomanual-${PORTVERSION}.pdf
+.endif
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/argouml.sh ${PREFIX}/bin/argouml
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${DATADIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/argomanual-${PORTVERSION}.pdf ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/argouml/distinfo b/devel/argouml/distinfo
index a0d94e7e9e9a..090851c012c0 100644
--- a/devel/argouml/distinfo
+++ b/devel/argouml/distinfo
@@ -1,2 +1,4 @@
-MD5 (ArgoUML-0.16.1.tar.gz) = a9cbe6b626f507e96e9c907db9819838
-SIZE (ArgoUML-0.16.1.tar.gz) = 5542726
+MD5 (ArgoUML-0.18.1.tar.gz) = 56ca12c9c14d21bfa6a4fd78be8b3c7b
+SIZE (ArgoUML-0.18.1.tar.gz) = 8950601
+MD5 (argomanual-0.18.1.pdf) = f426a1d60b444071765a8bbdd91cc5b6
+SIZE (argomanual-0.18.1.pdf) = 3684598
diff --git a/devel/argouml/files/argouml.sh.in b/devel/argouml/files/argouml.sh.in
index e5ad1bc6e18c..beeb7d05e504 100644
--- a/devel/argouml/files/argouml.sh.in
+++ b/devel/argouml/files/argouml.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="1.3+"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
+JAVA_VERSION="1.4+"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
diff --git a/devel/argouml/pkg-plist b/devel/argouml/pkg-plist
index 0521cd423e65..2b815a73f718 100644
--- a/devel/argouml/pkg-plist
+++ b/devel/argouml/pkg-plist
@@ -1,6 +1,6 @@
-@comment $FreeBSD$
 bin/argouml
 %%DATADIR%%/antlrall.jar
+%%DATADIR%%/argouml-model.jar
 %%DATADIR%%/argouml.jar
 %%DATADIR%%/commons-logging.jar
 %%DATADIR%%/gef.jar
@@ -9,6 +9,9 @@ bin/argouml
 %%DATADIR%%/log4j.jar
 %%DATADIR%%/nsuml.jar
 %%DATADIR%%/ocl-argo.jar
+%%DATADIR%%/swidgets.jar
 %%DATADIR%%/toolbar.jar
-%%DATADIR%%/xerces.jar
+%%DATADIR%%/xalan.jar
+%%DATADIR%%/xercesImpl.jar
+%%DATADIR%%/xml-apis.jar
 @dirrm %%DATADIR%%