diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index e89e4f677f54..6de6b8118059 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    kaffe
-# Version required:     0.4
+# Version required:     0.5p1
 # Date created:         20 February 1995
 # Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
 #
-# $Id: Makefile,v 1.3 1996/07/04 01:23:21 gpalmer Exp $
+# $Id: Makefile,v 1.4 1996/07/10 05:24:17 asami Exp $
 #
 
-DISTNAME=	kaffe-0.4p2
+DISTNAME=	kaffe-0.5p1
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.sarc.city.ac.uk/pub/kaffe/
 EXTRACT_SUFX=	.tgz
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index ea6deafe5417..11ba5ce180cc 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1 +1 @@
-MD5 (kaffe-0.4p2.tgz) = ee62dcb04192be3f493c241b7f215eb2
+MD5 (kaffe-0.5p1.tgz) = 780e966c5d76fdbf64d58fdfe075d562
diff --git a/java/kaffe/pkg-descr b/java/kaffe/pkg-descr
index 7d6cfb5befe2..31e153dcafc7 100644
--- a/java/kaffe/pkg-descr
+++ b/java/kaffe/pkg-descr
@@ -1,29 +1,40 @@
-This is Kaffe, a virtual machine design to execute Java bytecode.  Unlike
-other virtual machines available, this machine performs "just-in-time"
-code conversion from the abstract code to the host machine's native code.
-This will ultimately allow execution of Java code at the same speed as
-standard compiled code but while maintaining the advantages and flexibility
-of code independence.
+KAFFE v0.5p1 - A JIT and interpreting virtual machine to run Java(tm)* code
+===========================================================================
 
-Please note, this is version 0.3 and many feature are not yet implemented
-(notable there is no graphics support at the moment) and there are likely
-to be various odd bugs.  All comments to the mail address below.
+This is Kaffe, a virtual machine design to execute Java bytecode.
+This machine can be configured in two modes.  In one mode it operates as
+a pure bytecode interpreter (not unlike Javasoft's machine); in the second
+mode if performs "just-in-time" code conversion from the abstract code to
+the host machine's native code.  This will ultimately allow execution of
+Java code at the same speed as standard compiled code but while maintaining
+the advantages and flexibility of code independence.
 
-Tim
-tim@sarc.city.ac.uk
+This release include the new JIT system.  Currently only a 386 JIT exists but
+I intend to produce a SPARC jit machine in the near future to test is
+portablility and then concentrate on improving the generated code quality.
+However, these improvements will not effect the JIT target descriptions
+(the jit-???.def files) so people may want to consider producing versions
+for other platforms.
 
-Major changes in Kaffe v0.3
-===========================
+Running Kaffe
+=============
 
- * Split off Kaffe translator into a shared library.  This makes it
-   simpler to encorporate into other programs and is essential to
-   getting Kaffe running on some OS's.
+This version of Kaffe is not supplied with a copy of Sun's class library.
+FreeBSD users can install the jdk port/package for it.
 
- * Added array bounds checks.  This is very slow but the people want it
-   slow rather than not at all.
+Before running Kaffe it is necessary to configure the environment.
+This requires the setting of CLASSPATH, KAFFEHOME and LD_LIBRARY_PATH.
+For the standard installation these would be defined as follows:
 
- * Additional ports have been added.
+	CLASSPATH=.:/usr/local/share/kaffe/classes.zip
+	KAFFEHOME=/usr/local/share/kaffe
+	LD_LIBRARY_PATH=/usr/lib:/usr/local/lib
 
- * Extensive bug fixes for both particular ports as well as the general
-   system.
+A file "ENVIRONMENT" is generated by the configure program which contains
+a /bin/sh environment setup.  This may help you to figure out what to
+set to what if you alter the standard installation point.
 
+Tim Wilkinson
+<tim@sarc.city.ac.uk>
+----
+* Java and Javasoft are registered trademark of Sun Microsystems, Inc.
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index c8c1c3d0c93f..8db59b4c54c4 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -1,15 +1,12 @@
-@name kaffe
-@owner bin
-@group bin
 bin/javac
 bin/javadoc
 bin/kaffe
 bin/kaffeh
+lib/libkaffe_native.so.0.5
+lib/libkaffe_vm.so.0.5
+lib/libkaffe_net.so.0.5
+@exec /sbin/ldconfig -m %B
+include/kaffe/jtypes.h
 include/kaffe/native.h
 include/kaffe/stubPreamble.h
-include/kaffe/jtypes.h
-lib/libkaffe_vm.so.0.4
-lib/libkaffe_native.so.0.4
-lib/libkaffe_net.so.0.4
 share/kaffe/license.terms
-@exec /sbin/ldconfig -m %B