diff --git a/jre/.footprint b/jre/.footprint
index e783ee045..fa6950123 100644
--- a/jre/.footprint
+++ b/jre/.footprint
@@ -182,6 +182,7 @@ drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/fonts/
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/client/
 -rw-r--r--	root/root	usr/lib/jre1.6.0_23/lib/i386/client/Xusage.txt
+-r--r--r--	root/root	usr/lib/jre1.6.0_23/lib/i386/client/classes.jsa
 lrwxrwxrwx	root/root	usr/lib/jre1.6.0_23/lib/i386/client/libjsig.so -> ../libjsig.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/client/libjvm.so
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/headless/
@@ -190,7 +191,6 @@ drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/jli/
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/jli/libjli.so
 -rw-r--r--	root/root	usr/lib/jre1.6.0_23/lib/i386/jvm.cfg
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libJdbcOdbc.so
--rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libattach.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libawt.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libcmm.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libdcpr.so
@@ -224,7 +224,6 @@ drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/jli/
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libnpjp2.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libnpt.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/librmi.so
--rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libsaproc.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libsplashscreen.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libunpack.so
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/i386/libverify.so
@@ -333,6 +332,7 @@ drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/security/
 -rw-r--r--	root/root	usr/lib/jre1.6.0_23/lib/security/trusted.libraries
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/servicetag/
 -r--r--r--	root/root	usr/lib/jre1.6.0_23/lib/servicetag/jdk_header.png
+-rw-r--r--	root/root	usr/lib/jre1.6.0_23/lib/servicetag/registration.xml
 -rw-r--r--	root/root	usr/lib/jre1.6.0_23/lib/sound.properties
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/zi/
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/lib/zi/Africa/
@@ -807,3 +807,16 @@ drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/plugin/i386/ns7-gcc29/
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
 drwxr-xr-x	root/root	usr/lib/jre1.6.0_23/plugin/i386/ns7/
 -rwxr-xr-x	root/root	usr/lib/jre1.6.0_23/plugin/i386/ns7/libjavaplugin_oji.so
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/java.1.gz
+-rw-r--r--	root/root	usr/man/man1/javaws.1.gz
+-rw-r--r--	root/root	usr/man/man1/keytool.1.gz
+-rw-r--r--	root/root	usr/man/man1/orbd.1.gz
+-rw-r--r--	root/root	usr/man/man1/pack200.1.gz
+-rw-r--r--	root/root	usr/man/man1/policytool.1.gz
+-rw-r--r--	root/root	usr/man/man1/rmid.1.gz
+-rw-r--r--	root/root	usr/man/man1/rmiregistry.1.gz
+-rw-r--r--	root/root	usr/man/man1/servertool.1.gz
+-rw-r--r--	root/root	usr/man/man1/tnameserv.1.gz
+-rw-r--r--	root/root	usr/man/man1/unpack200.1.gz
diff --git a/jre/.md5sum b/jre/.md5sum
index c8812177b..8839a80ba 100644
--- a/jre/.md5sum
+++ b/jre/.md5sum
@@ -1 +1 @@
-cd02f6e8f46fb4171811150cb820c6ed  jdk-6u23-dlj-linux-i586.bin
+a8367e4af4f81764c760f93fe2fc0538  jre-6u23-linux-i586.bin
diff --git a/jre/Pkgfile b/jre/Pkgfile
index 3bcf08103..0e1d8661c 100644
--- a/jre/Pkgfile
+++ b/jre/Pkgfile
@@ -5,21 +5,22 @@
 
 name=jre
 version=1.6.0_23
-release=1
-source=(http://download.java.net/dlj/binaries/jdk-6u23-dlj-linux-i586.bin)
+release=2
+source=(file:///jre-6u23-linux-i586.bin)
 
 build(){
-    sh $SRC/jdk-*.bin --accept-license --unpack
-
-    cd jdk$version
+    sh $SRC/jre-*.bin --accept-license --unpack
 
     install -d $PKG/usr/{bin,lib}
-    mv jre $PKG/usr/lib/jre$version
+    mv jre$version $PKG/usr/lib
+    mv $PKG/usr/lib/jre$version/man $PKG/usr
+
     ln -s jre$version $PKG/usr/lib/java
     ln -s ../lib/java/bin/java $PKG/usr/bin/java
     ln -s ../lib/java/bin/javaws $PKG/usr/bin/javaws
     ln -s ../lib/java/bin/keytool $PKG/usr/bin/keytool
 
     rm $PKG/usr/lib/jre$version/[A-Z]*
+    rm -r $PKG/usr/lib/jre$version/.systemPrefs
+    rm -r $PKG/usr/man/ja*
 }
-
diff --git a/jre/README b/jre/README
new file mode 100644
index 000000000..dc15de227
--- /dev/null
+++ b/jre/README
@@ -0,0 +1,12 @@
+README for Java Runtime Enironment 6
+
+REQUIREMENTS
+
+   Download the Java Runtime Environment (JRE) from
+   -  http://www.oracle.com/technetwork/java/javase/downloads/index.html
+   
+   and put the file 
+   -  jre-6u*-linux-i586.bin 
+   
+   into the directory defined by PKGMK_SOURCE_DIR. See pkgmk.conf(5).
+