diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index c7b68cf6c952..3d77b707cd71 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    kaffe
-# Version required:     1.0.b3
+# Version required:     1.0.b4
 # Date created:         20 February 1995
 # Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
 #
-# $Id: Makefile,v 1.39 1999/01/23 07:05:27 vanilla Exp $
+# $Id: Makefile,v 1.40 1999/03/08 07:28:30 asami Exp $
 #
 
-DISTNAME=	kaffe-1.0.b3
+DISTNAME=	kaffe-1.0.b4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.transvirtual.com/pub/kaffe/
 
@@ -16,14 +16,12 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gif.3:${PORTSDIR}/graphics/giflib \
 		png.3:${PORTSDIR}/graphics/png
 
+WRKSRC=		${WRKDIR}/kaffe-1.0b4
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L/usr/local/lib"
-CONFIGURE_TARGET=	# empty
 MAN1=		kaffe.1
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ENVIRONMENT ${PREFIX}/share/kaffe
+	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${PREFIX}/share/kaffe
 	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index 9b047b70b533..16587768c0c0 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1 +1 @@
-MD5 (kaffe-1.0.b3.tar.gz) = 2b911676c380b88e5d3e3ba65b584740
+MD5 (kaffe-1.0.b4.tar.gz) = 86f917a3e592a80fff9affa2f92712a7
diff --git a/java/kaffe/pkg-comment b/java/kaffe/pkg-comment
index 33ae7370d8cb..38ccf681486b 100644
--- a/java/kaffe/pkg-comment
+++ b/java/kaffe/pkg-comment
@@ -1 +1 @@
-Virtual machine to run Java(tm) bytecode (includes an Awt package)
+Java virtual machine including JIT compiler and AWT package
diff --git a/java/kaffe/pkg-descr b/java/kaffe/pkg-descr
index 4d6a4b072e23..3a1298fed480 100644
--- a/java/kaffe/pkg-descr
+++ b/java/kaffe/pkg-descr
@@ -1,11 +1,8 @@
 Kaffe is a virtual machine used to run Java bytecode.  It includes
 its own implementation of the Java standard classes, including the
-Awt classes.
+AWT classes. Kaffe also does "just-in-time" compilation of Java
+bytecode into machine code for increased execution speed.
 
-Once you have installed Kaffe, make sure that you set the appropriate
-environment variables by running "sh /usr/local/share/kaffe/ENVIRONMENT"
+See http://www.kaffe.org for more info.
 
-http://www.kaffe.org
-
-----
 * Java and Javasoft are registered trademark of Sun Microsystems, Inc.
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index 8b9427d54606..396e54cf7b72 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -1,5 +1,3 @@
-bin/Kaffe
-bin/kaffeh
 bin/appletviewer
 bin/install-jar
 bin/jar
@@ -10,6 +8,7 @@ bin/javakey
 bin/javap
 bin/jdb
 bin/kaffe
+bin/kaffeh
 bin/native2ascii
 bin/pizza
 bin/pizzadoc
@@ -20,34 +19,49 @@ bin/serialver
 include/kaffe/Arrays.h
 include/kaffe/java_lang_Object.h
 include/kaffe/java_lang_String.h
-include/kaffe/java_lang_Throwable.h
 include/kaffe/java_lang_Thread.h
 include/kaffe/java_lang_ThreadGroup.h
-include/kaffe/jtypes.h
+include/kaffe/java_lang_Throwable.h
 include/kaffe/jmalloc.h
 include/kaffe/jni.h
+include/kaffe/jni_cpp.h
 include/kaffe/jsyscall.h
+include/kaffe/jtypes.h
 include/kaffe/native.h
+lib/kaffe/libawt-1.0b4.so
+lib/kaffe/libawt.la
 lib/kaffe/libawt.so
-lib/kaffe/libawt.so.1
+lib/kaffe/libio-1.0b4.so
+lib/kaffe/libio.la
 lib/kaffe/libio.so
-lib/kaffe/libio.so.1
+lib/kaffe/libmanagement-1.0b4.so
+lib/kaffe/libmanagement.la
 lib/kaffe/libmanagement.so
-lib/kaffe/libmanagement.so.1
+lib/kaffe/libmath-1.0b4.so
+lib/kaffe/libmath.la
 lib/kaffe/libmath.so
-lib/kaffe/libmath.so.1
+lib/kaffe/libnative-1.0b4.so
+lib/kaffe/libnative.la
 lib/kaffe/libnative.so
-lib/kaffe/libnative.so.1
+lib/kaffe/libnet-1.0b4.so
+lib/kaffe/libnet.la
 lib/kaffe/libnet.so
-lib/kaffe/libnet.so.1
+lib/kaffe/libzip-1.0b4.so
+lib/kaffe/libzip.la
 lib/kaffe/libzip.so
-lib/kaffe/libzip.so.1
+lib/libkaffevm-1.0b4.so
+lib/libkaffevm.la
+lib/libkaffevm.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-share/kaffe/ENVIRONMENT
-share/kaffe/license.terms
+libexec/Kaffe
+share/kaffe/BUILD_ENVIRONMENT
 share/kaffe/Klasses.jar
+share/kaffe/comm.jar
+share/kaffe/license.terms
 share/kaffe/pizza.jar
+share/kaffe/pjava.jar
+share/kaffe/servlet.jar
 @dirrm include/kaffe
 @dirrm lib/kaffe
 @dirrm share/kaffe