diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 3e13e884a64..2feff4b7428 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,23 +1,30 @@
-# $OpenBSD: Makefile,v 1.7 2002/12/29 20:41:07 fgsch Exp $
+# $OpenBSD: Makefile,v 1.8 2003/04/07 17:20:49 ian Exp $
 COMMENT="compile Java source into .class files (quickly!)"
 
 # Jikes, a fast Java compiler. As of OpenBSD 2.8, compilation needs
 # lots of space - up your limits and/or add swap space as appropriate.
 
-DISTNAME=	jikes-1.15
+DISTNAME=	jikes-1.18
 CATEGORIES=	lang
 HOMEPAGE=	http://oss.software.ibm.com/developerworks/opensource/jikes/
-MASTER_SITES=	http://oss.software.ibm.com/pub/jikes/
+MASTER_SITES=	ftp://www-126.ibm.com/pub/jikes/1.18/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	Ian Darwin <ian@openbsd.org>
 
 # IBM Public License
-PERMIT_PACKAGE_CDROM=   "commercial contributor must indemnify all others"
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= "commercial contributor must indemnify all others"
-PERMIT_DISTFILES_FTP=   Yes
+PERMIT_PACKAGE_CDROM=	"commercial contributor must indemnify all others"
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	"commercial contributor must indemnify all others"
+PERMIT_DISTFILES_FTP=	Yes
+
+LIB_DEPENDS=	iconv::converters/libiconv
+
+VMEM_WARNING=	Yes
 
 SEPARATE_BUILD=	simple
 CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+=	--includedir=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--libdir=${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/lang/jikes/distinfo b/lang/jikes/distinfo
index 9a3304b018c..76d03fbde53 100644
--- a/lang/jikes/distinfo
+++ b/lang/jikes/distinfo
@@ -1,3 +1,3 @@
-MD5 (jikes-1.15.tar.gz) = 88ccc470acb5c2c8e35badd534223e2c
-RMD160 (jikes-1.15.tar.gz) = c8131d7b83d7de66368ffd16744d5bd23bb87749
-SHA1 (jikes-1.15.tar.gz) = afa3be14c4d4c5ea4fbf004ad77814eff1cc1065
+MD5 (jikes-1.18.tar.bz2) = 74bbcfd31aa2d7df4b86c5fe2db315cc
+RMD160 (jikes-1.18.tar.bz2) = ce63e7e548f51c2168f80702896e96b59eff9b30
+SHA1 (jikes-1.18.tar.bz2) = 82569a81b6e6e28372e412abb4afea265c235db4
diff --git a/lang/jikes/pkg/MESSAGE b/lang/jikes/pkg/MESSAGE
index 5b198930b4c..f933fa91de6 100644
--- a/lang/jikes/pkg/MESSAGE
+++ b/lang/jikes/pkg/MESSAGE
@@ -1,7 +1,8 @@
 
 This software is subject to the terms of the IBM Jikes Compiler Open
-Source License Agreement in doc/jikes*/license.htm, also at this URL:
-http://oss.software.ibm.com/developerworks/opensource/jikes/project/.
+Source License Agreement in ${PREFIX}share/doc/jikes/license.htm, 
+also available at this URL:
+http://ibm.com/developerworks/oss/jikes/
 
 Copyright (C) 1996, 1998, International Business Machines Corporation
 and others.  All Rights Reserved.
diff --git a/lang/jikes/pkg/PLIST b/lang/jikes/pkg/PLIST
index 923cabeb460..48891c6781c 100644
--- a/lang/jikes/pkg/PLIST
+++ b/lang/jikes/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/11/02 07:52:04 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/04/07 17:20:49 ian Exp $
 bin/jikes
+include/jikesapi.h
 man/man1/jikes.1
 share/doc/jikes/license.htm
 @dirrm share/doc/jikes