diff --git a/toolchain/uClibc/config/0.9.28.2/cris b/toolchain/uClibc/config/0.9.28.2/cris
index 389ba8af9a..873c2209cc 100644
--- a/toolchain/uClibc/config/0.9.28.2/cris
+++ b/toolchain/uClibc/config/0.9.28.2/cris
@@ -38,7 +38,7 @@ UCLIBC_HAS_FLOATS=y
 # HAS_FPU is not set
 UCLIBC_HAS_SOFT_FLOAT=y
 DO_C99_MATH=y
-KERNEL_SOURCE="/raid/trunk/toolchain_build_cris/linux"
+KERNEL_SOURCE="../linux"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
 
diff --git a/toolchain/uClibc/config/cris b/toolchain/uClibc/config/cris
index f0071dc2b9..a285775e1a 100644
--- a/toolchain/uClibc/config/cris
+++ b/toolchain/uClibc/config/cris
@@ -1,5 +1,6 @@
 #
 # Automatically generated make config: don't edit
+# Fri May  2 20:06:55 2008
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -9,8 +10,10 @@ TARGET_cris=y
 # TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
+# TARGET_hppa is not set
 # TARGET_i386 is not set
 # TARGET_i960 is not set
+# TARGET_ia64 is not set
 # TARGET_m68k is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
@@ -21,25 +24,32 @@ TARGET_cris=y
 # TARGET_sh64 is not set
 # TARGET_sparc is not set
 # TARGET_v850 is not set
+# TARGET_vax is not set
 # TARGET_x86_64 is not set
 
 #
 # Target Architecture Features and Options
 #
-HAVE_ELF=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
 TARGET_ARCH="cris"
+FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_CRIS=y
+# CONFIG_CRISV32 is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
 ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
+
+#
+# Using Little Endian
+#
 ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
-# HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
+UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
-KERNEL_SOURCE="/raid/trunk/toolchain_build_cris/linux"
-C_SYMBOL_PREFIX=""
+KERNEL_HEADERS="./toolchain_build_cris/linux"
 HAVE_DOT_CONFIG=y
 
 #
@@ -48,28 +58,32 @@ HAVE_DOT_CONFIG=y
 # HAVE_NO_PIC is not set
 DOPIC=y
 # HAVE_NO_SHARED is not set
-HAVE_SHARED=y
 # ARCH_HAS_NO_LDSO is not set
-BUILD_UCLIBC_LDSO=y
+HAVE_SHARED=y
 # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
 LDSO_LDD_SUPPORT=y
 LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
-# DL_FINI_CRT_COMPAT is not set
-# UCLIBC_CTOR_DTOR is not set
+UCLIBC_CTOR_DTOR=y 
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
 # PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
 UCLIBC_HAS_LFS=y
-# UCLIBC_STATIC_LDCONFIG is not set
 # MALLOC is not set
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+# UCLIBC_SUSV3_LEGACY is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
 ASSUME_DEVPTS=y
 UCLIBC_HAS_TM_EXTENSIONS=y
@@ -78,12 +92,21 @@ UCLIBC_HAS_TZ_FILE=y
 UCLIBC_HAS_TZ_FILE_READ_MANY=y
 UCLIBC_TZ_FILE_PATH="/etc/TZ"
 
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
 #
 # Networking Support
 #
 UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+UCLIBC_HAS_BSD_RES_CLOSE=y
 
 #
 # String and Stdio Support
@@ -124,14 +147,19 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
 UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
 # Big and Tall
 #
 UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_FTW=y
 UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
 
 #
 # Library Installation Options
@@ -141,18 +169,28 @@ RUNTIME_PREFIX="/"
 DEVEL_PREFIX="/usr/"
 
 #
-# uClibc security related options
+# Security options
 #
-# UCLIBC_SECURITY is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
 
 #
 # uClibc development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 # DODEBUG_PT is not set
+DOSTRIP=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
 WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
 # UCLIBC_MJN3_ONLY is not set