diff --git a/kaffe/Makefile.common b/kaffe/Makefile.common
index a0335fd3b1..8905da1aef 100644
--- a/kaffe/Makefile.common
+++ b/kaffe/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.20 2006/03/14 01:28:00 jlamwww Exp $
+# $NetBSD: Makefile.common,v 1.21 2006/03/25 14:39:15 jtonio Exp $
 
-DISTNAME=     kaffe-1.1.7-rc1
+DISTNAME=     kaffe-1.1.7-rc2
 PKGNAME=      ${DISTNAME:S/-rc/rc/}
 CATEGORIES=   lang java
 MASTER_SITES= http://www.kaffe.org/~robilad/
diff --git a/kaffe/PLIST b/kaffe/PLIST
index c042a2be47..77aaf1ead7 100644
--- a/kaffe/PLIST
+++ b/kaffe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/23 17:37:27 jtonio Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/25 14:39:15 jtonio Exp $
 bin/kaffe-appletviewer
 bin/kaffe-jar
 bin/kaffe-java
@@ -42,6 +42,7 @@ java/kaffe/include/kaffe/java_lang_VMThrowable.h
 java/kaffe/include/kaffe/jmalloc.h
 java/kaffe/include/kaffe/trampoline.h
 java/kaffe/include/kaffe_jni.h
+java/kaffe/info/dir
 java/kaffe/info/fastjar.info
 java/kaffe/info/hacking.info
 java/kaffe/info/vmintegration.info
@@ -61,7 +62,6 @@ java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
 java/kaffe/jre/lib/logging.properties
-java/kaffe/jre/lib/rt.jar
 java/kaffe/jre/lib/security/Kaffe.security
 java/kaffe/lib/logging.properties
 java/kaffe/lib/security/classpath.security
@@ -69,6 +69,12 @@ java/kaffe/lib/tools.jar
 java/kaffe/license.terms
 java/kaffe/man/man1/fastjar.1
 java/kaffe/man/man1/kaffe.1
+java/kaffe/share/classpath/README
+java/kaffe/share/classpath/tools.zip
+@dirrm java/kaffe/share/classpath
+@dirrm java/kaffe/share
+@dirrm java/kaffe/man/man1
+@dirrm java/kaffe/man
 @dirrm java/kaffe/lib/security
 @dirrm java/kaffe/lib
 @dirrm java/kaffe/jre/lib/security
diff --git a/kaffe/distinfo b/kaffe/distinfo
index d4b3a87b7c..df459b4c44 100644
--- a/kaffe/distinfo
+++ b/kaffe/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/01/17 16:32:00 jtonio Exp $
+$NetBSD: distinfo,v 1.11 2006/03/25 14:39:15 jtonio Exp $
 
-SHA1 (kaffe-1.1.7-rc1.tar.gz) = fc54d7134c2af4114cccee774bd4f6994e29ea0f
-RMD160 (kaffe-1.1.7-rc1.tar.gz) = e13154e7d3cc5813b4e082708bb3c35c8524d082
-Size (kaffe-1.1.7-rc1.tar.gz) = 14199477 bytes
-SHA1 (patch-aa) = 813fe80ea22f1728429457640241412672ae5a3d
-SHA1 (patch-ab) = c29285ca6c29b98c9ba22a1696ad5a3f74fea2de
-SHA1 (patch-ac) = fdd16fa170cbe0515cbf64beb69890a1433dbf64
+SHA1 (kaffe-1.1.7-rc2.tar.gz) = 8d0e37df36e1f15e9eb5fc2936d391d05f81a3ea
+RMD160 (kaffe-1.1.7-rc2.tar.gz) = e2c8b597cfbf2f5788cd25f904229a1b5a9fddb7
+Size (kaffe-1.1.7-rc2.tar.gz) = 14493323 bytes
+SHA1 (patch-aa) = 2af0835f44e8c75952fc68c11d1ef79c1274f257
+SHA1 (patch-ab) = dcf086e65b8e10a59319bbb994cf1232ed1bacf6
+SHA1 (patch-ac) = 97970ef41fe62b506378e8538bfc01fc6d08c854
diff --git a/kaffe/patches/patch-aa b/kaffe/patches/patch-aa
index 10a379a190..bd9298d1fc 100644
--- a/kaffe/patches/patch-aa
+++ b/kaffe/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2006/01/17 16:32:02 jtonio Exp $
+$NetBSD: patch-aa,v 1.6 2006/03/25 14:39:15 jtonio Exp $
 
---- configure.orig	2006-01-17 17:15:32.000000000 +0100
+--- configure.orig	2006-03-25 00:24:04.000000000 +0100
 +++ configure
 @@ -492,7 +492,6 @@ ac_includes_default="\
  ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
  ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
  ac_subdirs_all="$ac_subdirs_all external/gcc/fastjar"
 -ac_subdirs_all="$ac_subdirs_all libltdl"
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE REPLACE_GETOPT_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE REPLACE_GETOPT_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS MKTEMP JASMIN HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH kaffe_builddir FASTJAR toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
  ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
  
-@@ -5419,10 +5418,10 @@ echo "$as_me: error: this package needs 
+@@ -5420,10 +5419,10 @@ echo "$as_me: error: this package needs 
    "") enable_ltdl_convenience=yes
        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
    esac
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.5 2006/01/17 16:32:02 jtonio Exp $
  
  
  
-@@ -50613,7 +50612,6 @@ subdirs="$subdirs external/gcc/fastjar"
+@@ -50681,7 +50680,6 @@ subdirs="$subdirs external/gcc/fastjar"
  
  
  
diff --git a/kaffe/patches/patch-ab b/kaffe/patches/patch-ab
index 59e143dca5..1b4f011739 100644
--- a/kaffe/patches/patch-ab
+++ b/kaffe/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2006/01/17 16:32:02 jtonio Exp $
+$NetBSD: patch-ab,v 1.5 2006/03/25 14:39:15 jtonio Exp $
 
---- Makefile.am.orig	2006-01-14 14:20:55.000000000 +0100
+--- Makefile.am.orig	2006-03-25 00:18:52.000000000 +0100
 +++ Makefile.am
 @@ -20,7 +20,6 @@ SUBDIRS = \
  	external \
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.4 2006/01/17 16:32:02 jtonio Exp $
  	kaffe \
  	libraries \
  	tools \
-@@ -209,7 +207,6 @@ DIRECTORIES_BEFORE_RTJAR = \
+@@ -210,7 +208,6 @@ DIRECTORIES_BEFORE_RTJAR = \
  	config \
  	include \
  	replace \
diff --git a/kaffe/patches/patch-ac b/kaffe/patches/patch-ac
index aba50c2fe1..b686f01da4 100644
--- a/kaffe/patches/patch-ac
+++ b/kaffe/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2006/01/17 16:32:02 jtonio Exp $
+$NetBSD: patch-ac,v 1.5 2006/03/25 14:39:15 jtonio Exp $
 
---- Makefile.in.orig	2006-01-15 00:57:49.000000000 +0100
+--- Makefile.in.orig	2006-03-25 00:24:02.000000000 +0100
 +++ Makefile.in
-@@ -389,7 +389,6 @@ SUBDIRS = \
+@@ -388,7 +388,6 @@ SUBDIRS = \
  	external \
  	libraries/javalib \
  	config \
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.4 2006/01/17 16:32:02 jtonio Exp $
  	kaffe/kaffeh \
  	include  \
  	kaffe/kaffevm \
-@@ -403,7 +402,6 @@ DIST_SUBDIRS = \
+@@ -402,7 +401,6 @@ DIST_SUBDIRS = \
  	external \
  	include \
  	replace \