diff --git a/Documentation/Developers/CHANGELOG-ESDEN b/Documentation/Developers/CHANGELOG-ESDEN
index 07013dc15..809a7f5f2 100644
--- a/Documentation/Developers/CHANGELOG-ESDEN
+++ b/Documentation/Developers/CHANGELOG-ESDEN
@@ -2,6 +2,37 @@
 This is a changelog for Dietlibc-Target, Alpha Target and all changes esden
 does for ROCKLinux ;-)
 
+*) 2003-09-04 (2.0.0-rc1 - 2.0.0-rc2)
+ - added vim to dietlibc target
+ - refixed util-linux package for dietlibc
+ - added isofs.txt file creation to dietlibc target
+
+*) 2003-09-03 (2.0.0-rc1 - 2.0.0-rc2)
+ - fixed scripts/Build-Tools so that it does not execute backup parse-config
+   files marked with ~ at the end of filename
+ - modified package/base/dietlibc/parse-config-9 so that it patches gcc to use
+   dietlibc as default c library
+ - fixed zlib, findutils, curl for dietlibc
+ - removed obsolated e2fsprogs dietlibc related patch
+ - fixed gcc3 for dietlibc making it shared/static aware and disabling c++,
+   java support when compiled with dietlibc. C++ needs further investigation
+   because it seems that it is fixable, but I postpone it for later.
+ - fixed coreutils and bison in stage 3 of dietlibc target. Somehow they are
+   hanging when trying to compile in doc subdirectory. Needs further
+   investigation...
+ - fixed util-linux under dietlibc without adding tons of headers to dietlibc
+   include directory!
+ - removed the DIETLIBC flag form syslinux and inserted addition of it in
+   target/bootdisk/config.in where it should be
+ - removed the DIETLIBC flag from memtest86 and bonnie++ because they are not
+   compiling with dietlibc yet and need more work (in bootdisk target they are
+   selected "manually" with config.in)
+ - grep is also hanging in doc directory in dietbuild so patched
+ - fixed cpio for dietlibc adding a patch and adding texinfo, ncurses to
+   dietlibc target (in the same run fixed ncurses for dietlibc (disabled c++
+   api))
+ - fixed net-tools for dietlibc
+
 *) 2003-08-18 (2.0.0-camp - 2.0.0-rc1)
  - fixed Task #38: sshd: issue a error if no keys are present on startup with a
    reference how to create the keys.
diff --git a/package/base/bonnie++/bonnie++.desc b/package/base/bonnie++/bonnie++.desc
index d92ca4ac4..a2fec27f9 100644
--- a/package/base/bonnie++/bonnie++.desc
+++ b/package/base/bonnie++/bonnie++.desc
@@ -34,7 +34,6 @@
 [M] Clifford Wolf <clifford@clifford.at>
 
 [C] base/tool
-[F] DIETLIBC
 
 [L] GPL
 [S] Stable
diff --git a/package/base/dietlibc/parse-config-9 b/package/base/dietlibc/parse-config-9
index d06bfd769..93566e41b 100644
--- a/package/base/dietlibc/parse-config-9
+++ b/package/base/dietlibc/parse-config-9
@@ -20,6 +20,28 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+# --- FUNCTIONS-BEGIN ---
+function set_wrapper_and_misc () {
+	if [ "$stagelevel" -le 1 ] ; then
+		var_append CC_WRAPPER_INSERT " " "-nostdinc"
+		# all dietlibc pathes are redirected into the build system
+		var_insert CC_WRAPPER_FILTER "|" "sed -e 's,/usr/dietlibc/,$root&,'"
+		var_append CC_WRAPPER_OTHERS ":" $dietbin
+	else
+		if [ "$diet_dynamic_static" == "statically"  ] ; then
+			var_append GCC_WRAPPER_INSERT " " "-static"
+		fi
+		var_append GCC_WRAPPER_INSERT " " "-D__dietlibc__"
+	fi
+}
+
+function add_lib () {
+	if [ "$stagelevel" -le 1 ] ; then var_append CC_WRAPPER_APPEND_PO " " "$1"
+	else var_append CC_WRAPPER_APPEND " " "$1"; fi
+}
+# --- FUNCTIONS-END --
+
+# decide wether to compile the packet with dietlibc or not
 if [ "$ROCKCFG_DIETLIBC_ALL" = 1 -o "$pkg" = "dietlibc" ]; then
 	pkg_dietlibc_useit=1
 else
@@ -27,7 +49,7 @@ else
 	eval "pkg_dietlibc_useit=\$ROCKCFG_DIETLIBC_${x}"
 fi
 [ "$pkg_dietlibc_useit" != 1 ] && pkg_dietlibc_useit=0
-[ "$stagelevel" -eq 0 ] && pkg_dietlibc_useit=0
+[ "$stagelevel" -eq 0 ] && pkg_dietlibc_useit=0		# never use dietlibc in stage 0
 
 if [ "$pkg_dietlibc_useit" = 1 ]; then
 
@@ -44,27 +66,26 @@ if [ "$pkg_dietlibc_useit" = 1 ]; then
 	fi
 
 	if [ "$ROCKCFG_DIETLIBC_DYN" = "1" ]
-	then dietbin="diet-dyn" ; x="dynamically"
-	else dietbin="diet" ; x="statically" ; fi
+	then dietbin="diet-dyn" ; diet_dynamic_static="dynamically"
+	else dietbin="diet" ; diet_dynamic_static="statically" ; fi
 
-	echo_status "Preparing configuration to build this package with dietlibc ($x)."
+	echo_status "Preparing configuration to build this package with dietlibc ($diet_dynamic_static)."
 
-	if [ "$stagelevel" -le 1 ]; then
-		# all dietlibc pathes are redirected into the build system
-		var_insert CC_WRAPPER_FILTER "|" "sed -e 's,/usr/dietlibc/,$root&,'"
-#	else
-#		var_remove CC_WRAPPER_INSERT " " "-pipe" ;
-#		var_append CC_WRAPPER_REMOVE " " "-pipe" ;
+	if [ "$stagelevel" -gt 1 ]; then
+		var_remove CC_WRAPPER_INSERT " " "-pipe" ;
+		var_append CC_WRAPPER_REMOVE " " "-pipe" ;
+
+		var_remove GCC_WRAPPER_INSERT " " "-pipe" ;
+		var_append GCC_WRAPPER_REMOVE " " "-pipe" ;
 
-#		var_remove GCC_WRAPPER_INSERT " " "-pipe" ;
-#		var_append GCC_WRAPPER_REMOVE " " "-pipe" ;
+		var_remove KCC_WRAPPER_INSERT " " "-pipe" ;
+		var_append KCC_WRAPPER_REMOVE " " "-pipe" ;
 
-#		patchopt="-bf -p1 -x 16 -z .orig" ;
 #		var_append CC_WRAPPER_INSERT " " "-L/usr/i386-pc-linux-gnulibc1/lib"
 	fi
 
-	# use dietlibc headers instead of system defaults
-	var_append CC_WRAPPER_INSERT " " "-nostdinc"
+	# patch has problems with Plan A patching so we switch with -x 16 to Plan B
+	[ "$stagelevel" -ge 9 ] && patchopt="-bfp1 -x 16 -z .orig"
 
 	case "$pkg" in
 		dietlibc)
@@ -73,51 +94,76 @@ if [ "$pkg_dietlibc_useit" = 1 ]; then
 
 		linux*)
 			echo_status "This package is currently blacklisted and not build using dietlibc!"
+			[ "$stagelevel" -gt 1 ] && [ "$diet_dynamic_static" == "statically" ] && var_append GCC_WRAPPER_INSERT " " "-static"
 			;;
 
-		util-linux|e2fsprogs|net-tools) # the packets that have BSD problems and/or GNU problems
+		e2fsprogs) # the packets that have BSD problems and/or GNU problems
 			echo_status "Setting dietlibc special GNU/BSD settings!"
 			var_append CC_WRAPPER_INSERT " " "-D_BSD_SOURCE"
 			var_append CC_WRAPPER_INSERT " " "-D_GNU_SOURCE"
-			var_append CC_WRAPPER_OTHERS ":" $dietbin
+			set_wrapper_and_misc
+			;;
+
+		util-linux|net-tools) # the packets that have BSD problems and/or GNU
+			    # problems and need tons of linux headers
+			echo_status "Setting dietlibc special GNU/BSD and linux header settings!"
+			var_append CC_WRAPPER_INSERT " " "-D_BSD_SOURCE"
+			var_append CC_WRAPPER_INSERT " " "-D_GNU_SOURCE"
+			var_append CC_WRAPPER_INSERT " " "-nostdinc"
+			var_append CC_WRAPPER_APPEND " " "-I$root/usr/dietlibc/include"
+			var_append CC_WRAPPER_APPEND " " "-I$root/usr/include"
+			set_wrapper_and_misc
 			;;
 
 		sed)
 			echo_status "Setting dietlibc special lcompat settings!"
-			var_append CC_WRAPPER_APPEND_PO " " "-lcompat"
-			var_append CC_WRAPPER_OTHERS ":" $dietbin
+			add_lib "-lcompat"
+			set_wrapper_and_misc
 			;;
 
-		coreutils)
+		coreutils|findutils)
 			echo_status "Setting dietlibc special lcompat+BSD settings!"
-			var_append CC_WRAPPER_APPEND_PO " " "-lcompat"
 			var_append CC_WRAPPER_INSERT " " "-D_BSD_SOURCE"
-			var_append CC_WRAPPER_OTHERS ":" $dietbin
+			add_lib "-lcompat"
+			set_wrapper_and_misc
 			;;
 
 		iproute2)
-			echo_status "Allowing default headers from /usr/include!"	
-			var_append CC_WRAPPER_OTHERS ":" $dietbin
+			echo_status "Allowing default headers from /usr/include!"
 
 			# needs to be last since otherwise the (g)libc headers
 			# in /usr/include would be used instead of the dietlibc
 			# ones ... - so append instead insert.
+			# XXX check if it is really needed in that form ...
 			var_append CC_WRAPPER_APPEND " " "-I$root/usr/include"
 			var_append CC_WRAPPER_INSERT " " "-I/usr/dietlibc/include"
+
+			set_wrapper_and_misc
 			;;
 
 		*)
 			echo_status "Using default dietlibc compiler options!"
-			var_append CC_WRAPPER_OTHERS ":" $dietbin
+			set_wrapper_and_misc
 			;;
 	esac
 
 	case "$pkg" in
 		coreutils)
 			var_remove patchfiles " " "*acl-xattr.patch"
-		;;
+			;;
+		curl)
+			[ "$diet_dynamic_static" == "statically"  ] && var_append extraconfopt " " "--disable-shared"
+			;;
+		ncurses)
+			var_append extraconfopt " " "--without-cxx-binding --without-cxx"
+			;;
+		util-linux)
+			add_lib "-lrpc"
+			add_lib "-lcompat"
+			;;
 	esac
 
 	var_append patchfiles " " `ls $base/package/base/dietlibc/pkg_patch/pkg_$pkg.patch 2>/dev/null`
+	[ "$stagelevel" -ge 1 ] && var_append patchfiles " " `ls $base/package/base/dietlibc/pkg_patch/pkg_$pkg.chroot.patch 2>/dev/null`
 fi
 
diff --git a/package/base/dietlibc/pkg_patch/pkg_bison.patch b/package/base/dietlibc/pkg_patch/pkg_bison.patch
index 246f7a72b..349ab1d70 100644
--- a/package/base/dietlibc/pkg_patch/pkg_bison.patch
+++ b/package/base/dietlibc/pkg_patch/pkg_bison.patch
@@ -41,3 +41,14 @@
  if expr a : '\(a\)' >/dev/null 2>&1; then
    as_expr=expr
  else
+--- bison-1.875/Makefile.in~	Wed Jan  1 10:12:54 2003
++++ bison-1.875/Makefile.in	Wed Aug 20 22:30:36 2003
+@@ -142,7 +142,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = config po lib data src doc m4 tests
++SUBDIRS = config po lib data src m4 tests
+ 
+ EXTRA_DIST = REFERENCES OChangeLog Makefile.maint GNUmakefile
+ 
diff --git a/package/base/dietlibc/pkg_patch/pkg_coreutils.patch b/package/base/dietlibc/pkg_patch/pkg_coreutils.patch
index b80447fc7..a08507252 100644
--- a/package/base/dietlibc/pkg_patch/pkg_coreutils.patch
+++ b/package/base/dietlibc/pkg_patch/pkg_coreutils.patch
@@ -70,3 +70,14 @@
  #include "posixtm.h"
  #include "posixver.h"
  #include "strftime.h"
+--- coreutils-5.0/Makefile.in~	Wed Apr  2 16:28:41 2003
++++ coreutils-5.0/Makefile.in	Wed Aug 20 22:16:44 2003
+@@ -149,7 +149,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = lib src doc man m4 po tests
++SUBDIRS = lib src man m4 po tests
+ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
+   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
+   announce-gen \
diff --git a/package/base/dietlibc/pkg_patch/pkg_cpio.patch b/package/base/dietlibc/pkg_patch/pkg_cpio.patch
new file mode 100644
index 000000000..704412c67
--- /dev/null
+++ b/package/base/dietlibc/pkg_patch/pkg_cpio.patch
@@ -0,0 +1,22 @@
+--- cpio-2.5/rtapelib.c~	Thu Dec  6 05:55:12 2001
++++ cpio-2.5/rtapelib.c	Thu Aug 21 01:17:19 2003
+@@ -202,7 +202,8 @@
+   return atoi (cp + 1);
+ }
+ 
+-#ifdef HAVE_NETDB_H
++#if 0
++/*#ifdef HAVE_NETDB_H*/
+ /* Execute /etc/rmt as user USER on remote system HOST using rexec.
+    Return a file descriptor of a bidirectional socket for stdin and stdout.
+    If USER is NULL, or an empty string, use the current username.
+@@ -340,7 +341,8 @@
+     }
+   *dev = '\0';
+ 
+-#ifdef HAVE_NETDB_H
++#if 0
++/*#ifdef HAVE_NETDB_H*/
+   /* Execute the remote command using rexec.  */
+   READ (i) = WRITE (i) = _rmt_rexec (system, login);
+   if (READ (i) < 0)
diff --git a/package/base/dietlibc/pkg_patch/pkg_e2fsprogs.patch b/package/base/dietlibc/pkg_patch/pkg_e2fsprogs.patch
deleted file mode 100644
index 7f3a98db6..000000000
--- a/package/base/dietlibc/pkg_patch/pkg_e2fsprogs.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_e2fsprogs.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./misc/tune2fs.c.orig	Tue May  7 01:12:40 2002
-+++ ./misc/tune2fs.c	Tue May  7 01:13:10 2002
-@@ -406,23 +406,6 @@
- 		print_label++;
- }
- 
--static time_t parse_time(char *str)
--{
--	struct	tm	ts;
--
--	if (strcmp(str, "now") == 0) {
--		return (time(0));
--	}
--	memset(&ts, 0, sizeof(ts));
--	strptime(optarg, "%Y%m%d%H%M%S", &ts);
--	if (ts.tm_mday == 0) {
--		com_err(program_name, 0,
--			_("Couldn't parse date/time specifier: %s"),
--			str);
--		usage();
--	}
--	return (mktime(&ts));
--}
- 
- static void parse_tune2fs_options(int argc, char **argv)
- {
-@@ -586,11 +569,6 @@
- 				break;
- 			case 's':
- 				s_flag = atoi(optarg);
--				open_flag = EXT2_FLAG_RW;
--				break;
--			case 'T':
--				T_flag = 1;
--				last_check_time = parse_time(optarg);
- 				open_flag = EXT2_FLAG_RW;
- 				break;
- 			case 'u':
diff --git a/package/base/dietlibc/pkg_patch/pkg_findutils.patch b/package/base/dietlibc/pkg_patch/pkg_findutils.patch
new file mode 100644
index 000000000..a340a44d4
--- /dev/null
+++ b/package/base/dietlibc/pkg_patch/pkg_findutils.patch
@@ -0,0 +1,73 @@
+The getline stuff should be made in a more clean way ... perhups it will be
+then upstreamable ... who knows ;)
+
+putw and getw could also be put in a __dietlibc__ conditional ...
+
+--- findutils-4.1.orig/locate/code.c	1994-09-26 23:06:09.000000000 +0000
++++ findutils-4.1/locate/code.c	2002-09-18 23:37:03.000000000 +0000
+@@ -172,7 +172,11 @@
+       if (diffcount < -LOCATEDB_OLD_OFFSET || diffcount > LOCATEDB_OLD_OFFSET)
+ 	{
+ 	  putc (LOCATEDB_OLD_ESCAPE, stdout);
+-	  putw (diffcount + LOCATEDB_OLD_OFFSET, stdout);
++	  {
++	    int a = diffcount + LOCATEDB_OLD_OFFSET;
++	    fwrite(&a,sizeof(a),1,stdout);
++	  }
++//	  putw (diffcount + LOCATEDB_OLD_OFFSET, stdout);
+ 	}
+       else
+ 	putc (diffcount + LOCATEDB_OLD_OFFSET, stdout);
+diff -Nur findutils-4.1.orig/locate/locate.c findutils-4.1/locate/locate.c
+--- findutils-4.1.orig/locate/locate.c	1994-09-26 23:06:14.000000000 +0000
++++ findutils-4.1/locate/locate.c	2002-09-18 23:37:07.000000000 +0000
+@@ -246,8 +246,12 @@
+       if (old_format)
+ 	{
+ 	  /* Get the offset in the path where this path info starts.  */
+-	  if (c == LOCATEDB_OLD_ESCAPE)
+-	    count += getw (fp) - LOCATEDB_OLD_OFFSET;
++	  if (c == LOCATEDB_OLD_ESCAPE) {
++	    int a;
++	    fread(&a,sizeof(a),1,fp);
++	    count += a - LOCATEDB_OLD_OFFSET;
++//	    count += getw (fp) - LOCATEDB_OLD_OFFSET;
++	  }
+ 	  else
+ 	    count += c - LOCATEDB_OLD_OFFSET;
+
+--- ./gnulib/lib/getline.c.orig	Wed Aug 20 14:00:08 2003
++++ ./gnulib/lib/getline.c	Wed Aug 20 14:01:39 2003
+@@ -33,7 +33,7 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
+-
++#if 0
+ #if defined __GNU_LIBRARY__ && HAVE_GETDELIM
+ 
+ int
+@@ -145,4 +145,5 @@
+ {
+   return getdelim2 (lineptr, n, stream, delimiter, 0, 0);
+ }
++#endif
+ #endif
+--- ./gnulib/lib/getline.h.orig	Wed Aug 20 13:59:59 2003
++++ ./gnulib/lib/getline.h	Wed Aug 20 14:00:34 2003
+@@ -30,13 +30,13 @@
+ 
+ /* glibc2 has these functions declared in <stdio.h>.  Avoid redeclarations.  */
+ # if __GLIBC__ < 2
+-
++/*
+ int
+ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+ 
+ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+-
++*/
+ # endif
+ 
+ #endif /* not GETLINE_H_ */
diff --git a/package/base/dietlibc/pkg_patch/pkg_gcc3.chroot.patch b/package/base/dietlibc/pkg_patch/pkg_gcc3.chroot.patch
new file mode 100644
index 000000000..41f25b403
--- /dev/null
+++ b/package/base/dietlibc/pkg_patch/pkg_gcc3.chroot.patch
@@ -0,0 +1,88 @@
+diff -Nur gcc-3.2.3.orig/gcc/Makefile.in gcc-3.2.3/gcc/Makefile.in
+--- gcc-3.2.3.orig/gcc/Makefile.in	Tue Jan 28 22:54:07 2003
++++ gcc-3.2.3/gcc/Makefile.in	Tue Jun  3 23:18:27 2003
+@@ -232,9 +232,9 @@
+ FIBHEAP_H   = $(srcdir)/../include/fibheap.h
+ 
+ # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+-NATIVE_SYSTEM_HEADER_DIR = /usr/include
++NATIVE_SYSTEM_HEADER_DIR = /usr/dietlibc/include
+ # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+-CROSS_SYSTEM_HEADER_DIR = $(build_tooldir)/sys-include
++CROSS_SYSTEM_HEADER_DIR = /usr/dietlibc/include
+ 
+ # autoconf sets SYSTEM_HEADER_DIR to one of the above.
+ SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@
+diff -Nur gcc-3.2.3.orig/gcc/config/linux.h gcc-3.2.3/gcc/config/linux.h
+--- gcc-3.2.3.orig/gcc/config/linux.h	Tue Dec 18 11:42:32 2001
++++ gcc-3.2.3/gcc/config/linux.h	Thu Jun  5 19:46:50 2003
+@@ -46,22 +46,10 @@
+    object constructed before entering `main'. */
+    
+ #undef	STARTFILE_SPEC
+-#ifdef USE_GNULIBC_1
+ #define STARTFILE_SPEC \
+-  "%{!shared: \
+-     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
+-		       %{!p:%{profile:gcrt1.o%s} \
+-			 %{!profile:crt1.o%s}}}} \
+-   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
+-#else
+-#define STARTFILE_SPEC \
+-  "%{!shared: \
+-     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
+-		       %{!p:%{profile:gcrt1.o%s} \
+-			 %{!profile:crt1.o%s}}}} \
+-   crti.o%s %{static:crtbeginT.o%s}\
+-   %{!static:%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}"
+-#endif
++  "start.o%s"
++/*  "%{!shared:start.o%s}\
++   %{shared:shared_not_yet_set_in_STARTFILE_SPEC.o%s}"*/
+ 
+ /* Provide a ENDFILE_SPEC appropriate for GNU/Linux.  Here we tack on
+    the GNU/Linux magical crtend.o file (see crtstuff.c) which
+@@ -71,8 +59,9 @@
+ 
+ #undef	ENDFILE_SPEC
+ #define ENDFILE_SPEC \
+-  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
+-
++  ""
++/*"%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
++*/
+ /* This is for -profile to use -lc_p instead of -lc. */
+ #ifndef CC1_SPEC
+ #define CC1_SPEC "%{profile:-p}"
+diff -Nur gcc-3.2.3.orig/gcc/cppdefault.h gcc-3.2.3/gcc/cppdefault.h
+--- gcc-3.2.3.orig/gcc/cppdefault.h	Sun Oct  7 18:50:51 2001
++++ gcc-3.2.3/gcc/cppdefault.h	Tue Jun  3 23:19:22 2003
+@@ -27,7 +27,7 @@
+    tradcpp.  */
+ 
+ #ifndef STANDARD_INCLUDE_DIR
+-#define STANDARD_INCLUDE_DIR "/usr/include"
++#define STANDARD_INCLUDE_DIR "/usr/dietlibc/include"
+ #endif
+ 
+ #ifndef STANDARD_INCLUDE_COMPONENT
+diff -Nur gcc-3.2.3.orig/gcc/gcc.c gcc-3.2.3/gcc/gcc.c
+--- gcc-3.2.3.orig/gcc/gcc.c	Wed Jun  4 11:55:54 2003
++++ gcc-3.2.3/gcc/gcc.c	Thu Jun  5 20:04:26 2003
+@@ -1340,6 +1340,7 @@
+ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+ static const char *const standard_startfile_prefix_1 = "/lib/";
+ static const char *const standard_startfile_prefix_2 = "/usr/lib/";
++static const char *const standard_startfile_prefix_3 = "/usr/dietlibc/lib-i386/";
+ 
+ static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX;
+ static const char *tooldir_prefix;
+@@ -5976,6 +5977,8 @@
+       add_prefix (&startfile_prefixes, standard_startfile_prefix_1,
+ 		  "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
+       add_prefix (&startfile_prefixes, standard_startfile_prefix_2,
++		  "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
++      add_prefix (&startfile_prefixes, standard_startfile_prefix_3,
+ 		  "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
+ #if 0 /* Can cause surprises, and one can use -B./ instead.  */
+       add_prefix (&startfile_prefixes, "./", NULL,
diff --git a/package/base/dietlibc/pkg_patch/pkg_grep.patch b/package/base/dietlibc/pkg_patch/pkg_grep.patch
index 700517744..61a76bf31 100644
--- a/package/base/dietlibc/pkg_patch/pkg_grep.patch
+++ b/package/base/dietlibc/pkg_patch/pkg_grep.patch
@@ -69,3 +69,14 @@
  if expr a : '\(a\)' >/dev/null 2>&1; then
    as_expr=expr
  else
+--- grep-2.5.1/Makefile.in~	Tue Mar 26 17:09:34 2002
++++ grep-2.5.1/Makefile.in	Thu Aug 21 00:57:55 2003
+@@ -97,7 +97,7 @@
+ 
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+-SUBDIRS = intl po lib doc src tests m4 vms bootstrap
++SUBDIRS = intl po lib src tests m4 vms bootstrap
+ 
+ EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM
+ 
diff --git a/package/base/dietlibc/pkg_patch/pkg_util-linux.patch b/package/base/dietlibc/pkg_patch/pkg_util-linux.patch
index 95e34c24e..2c0e4635f 100644
--- a/package/base/dietlibc/pkg_patch/pkg_util-linux.patch
+++ b/package/base/dietlibc/pkg_patch/pkg_util-linux.patch
@@ -181,22 +181,6 @@ diff -Nur util-linux-2.11q.orig/mount/mount.c util-linux-2.11q/mount/mount.c
        chdir(thisdir);
        if (verbose) printf("mount: change '%s' to '%s'\n",oldnode,node);
      }
---- ./mount/Makefile~	Tue Nov 26 09:53:59 2002
-+++ ./mount/Makefile	Sat Feb 15 12:40:33 2003
-@@ -45,11 +45,11 @@
- mount: mount.o fstab.o sundries.o realpath.o mntent.o version.o \
-        mount_guess_fstype.o get_label_uuid.o mount_by_label.o getusername.o \
-        $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
--	$(LINK) $^ -o $@
-+	$(LINK) $^ -o $@ -lrpc
- 
- umount: umount.o fstab.o sundries.o realpath.o mntent.o getusername.o \
- 	get_label_uuid.o version.o $(LIB)/env.o $(LO_OBJS)
--	$(LINK) $^ -o $@
-+	$(LINK) $^ -o $@ -lrpc
- 
- swapon:	swapon.o version.o
- 	$(LINK) $^ -o $@
 diff -Nur util-linux-2.11q.orig/text-utils/column.c util-linux-2.11q/text-utils/column.c
 --- util-linux-2.11q.orig/text-utils/column.c	Sat Mar  9 00:05:21 2002
 +++ util-linux-2.11q/text-utils/column.c	Mon May  6 01:03:39 2002
@@ -277,3 +261,26 @@ diff -Nur util-linux-2.11q.orig/text-utils/display.c util-linux-2.11q/text-utils
  				break;
  			case F_TEXT:
  				(void)printf("%s", pr->fmt);
+--- util-linux-2.11z/text-utils/more.c~	Thu Sep  4 12:05:49 2003
++++ util-linux-2.11z/text-utils/more.c	Thu Sep  4 12:07:38 2003
+@@ -53,7 +53,6 @@
+ #include <sys/stat.h>
+ #include <sys/file.h>
+ #include <sys/wait.h>
+-#include <a.out.h>
+ #include <locale.h>
+ #include "xstrncpy.h"
+ #include "nls.h"
+@@ -554,9 +553,9 @@
+ 
+ 	if (fread(twobytes, 2, 1, f) == 1) {
+ 		switch(twobytes[0] + (twobytes[1]<<8)) {
+-		case OMAGIC:	/* 0407 */
+-		case NMAGIC:	/* 0410 */
+-		case ZMAGIC:	/* 0413 */
++		case 0407:	/* OMAGIC */
++		case 0410:	/* NMAGIC */
++		case 0413:	/* ZMAGIC */
+ 		case 0405:
+ 		case 0411:
+ 		case 0177545:
diff --git a/package/base/gcc3/gcc3.conf b/package/base/gcc3/gcc3.conf
index 3056e6d30..997de8336 100644
--- a/package/base/gcc3/gcc3.conf
+++ b/package/base/gcc3/gcc3.conf
@@ -154,6 +154,9 @@ custmain() {
 		if [ $pkg = gcc2 -a "$ROCKCFG_PKG_GCC2_NO_CHILL" = 1 ] ; then
 			# gcc-2.x contains no java compiler
 			confopt="$confopt --enable-languages=c,c++,objc,f77"
+		elif [ "$ROCKCFG_DIETLIBC_ALL" = 1 -o "$ROCKCFG_DIETLIBC_gcc3" = 1 ] ; then
+			# c++ and java are not working with dietlibc FIXME
+			confopt="$confopt  --enable-languages=c,objc"
 		elif [ $pkg = gcc3  -a "$ROCKCFG_PKG_GCC3_NO_JAVA"  = 1 ] || \
 		     [ $pkg = gcc33 -a "$ROCKCFG_PKG_GCC33_NO_JAVA" = 1 ] || \
 		     [ $pkg = gccx  -a "$ROCKCFG_PKG_GCCX_NO_JAVA"  = 1 ] ; then
@@ -170,12 +173,18 @@ custmain() {
 			confopt="$confopt --enable-__cxa_atexit"
 		fi
 
+		# Set enable-shared
+		if [ "$diet_dynamic_static" == "statically" ] ; then
+			confopt="$confopt --enable-shared=no"
+		else
+			confopt="$confopt --enable-shared=yes"
+		fi
+
 		# Configure, build and install as usual
 		#
 		eval $configprefix ../configure $confopt --with-gnu-as \
 			--enable-version-specific-runtime-libs \
-			--with-gnu-ld --enable-threads=posix \
-			--enable-shared
+			--with-gnu-ld --enable-threads=posix
 
 		hook_eval premake
 		eval "$MAKE GCJFLAGS=\"$CXXFLAGS\" all"
diff --git a/package/base/ncurses/ncurses.desc b/package/base/ncurses/ncurses.desc
index 00f6ca20a..92d2e4216 100644
--- a/package/base/ncurses/ncurses.desc
+++ b/package/base/ncurses/ncurses.desc
@@ -33,6 +33,7 @@
 [M] Clifford Wolf <clifford@clifford.at>
 
 [C] base/library
+[F] DIETLIBC
 
 [L] GPL
 [S] Stable
diff --git a/package/base/texinfo/texinfo.desc b/package/base/texinfo/texinfo.desc
index e63d874d8..301072beb 100644
--- a/package/base/texinfo/texinfo.desc
+++ b/package/base/texinfo/texinfo.desc
@@ -31,6 +31,7 @@
 [M] Clifford Wolf <clifford@clifford.at>
 
 [C] base/tool
+[F] DIETLIBC
 
 [L] GPL
 [S] Stable
diff --git a/package/base/zlib/zlib.conf b/package/base/zlib/zlib.conf
index 24c47e8b3..eab7d53b8 100644
--- a/package/base/zlib/zlib.conf
+++ b/package/base/zlib/zlib.conf
@@ -30,7 +30,7 @@ zlib_pm() {
 	cp -v algorithm.txt $docdir
 }
 
-var_insert confopt " " "--shared"
+[ "$diet_dynamic_static" != "statically"  ] && var_insert confopt " " "--shared"
 var_insert CC_WRAPPER_INSERT " " "-fPIC"
 hook_add preconf 3 "unset AR"
 hook_add postmake 3 "zlib_pm"
diff --git a/package/rene/vim/vim.desc b/package/rene/vim/vim.desc
index 5f91d05a3..031713d00 100644
--- a/package/rene/vim/vim.desc
+++ b/package/rene/vim/vim.desc
@@ -49,6 +49,7 @@
 [M] Tobias Hintze <th@rocklinux.org>
 
 [C] extra/editor
+[F] DIETLIBC
 
 [L] OpenSource
 [S] Stable
diff --git a/package/x86/memtest86/memtest86.desc b/package/x86/memtest86/memtest86.desc
index 88d91db7b..b6fd0952f 100644
--- a/package/x86/memtest86/memtest86.desc
+++ b/package/x86/memtest86/memtest86.desc
@@ -42,7 +42,6 @@
 [M] Clifford Wolf <clifford@clifford.at>
 
 [C] base/tool
-[F] DIETLIBC
 [R] + x86
 
 [L] GPL
diff --git a/package/x86/syslinux/syslinux.desc b/package/x86/syslinux/syslinux.desc
index bc60a625e..032473909 100644
--- a/package/x86/syslinux/syslinux.desc
+++ b/package/x86/syslinux/syslinux.desc
@@ -33,7 +33,6 @@
 [M] Clifford Wolf <clifford@clifford.at>
 
 [C] base/tool
-[F] DIETLIBC
 [R] + x86
 
 [L] GPL
diff --git a/scripts/Build-Tools b/scripts/Build-Tools
index 9df14ec50..5da0feae2 100755
--- a/scripts/Build-Tools
+++ b/scripts/Build-Tools
@@ -262,6 +262,7 @@ EOT
 	     architecture/$arch/. package/. target/$target/. misc/ -type f \
 	     '(' -name 'parse-config' -o -name 'parse-config-*' ')' \
 	     '(' ! -name 'parse-config-x' -o ! -name 'parse-config-*-x' ')' \
+	     '(' ! -name '*~' ')' \
 	     -printf '%f\t%p\n' | sort | awk '{ $1="."; print; }' \
 			> build/$ROCKCFG_ID/$toolsdir/lib/parse-config.$$
 	mv build/$ROCKCFG_ID/$toolsdir/lib/parse-config.$$ \
diff --git a/target/bootdisk/config.in b/target/bootdisk/config.in
index 4064c287d..d8a0a774e 100644
--- a/target/bootdisk/config.in
+++ b/target/bootdisk/config.in
@@ -46,7 +46,7 @@ pkgfilter sed '
 / silo /	{ p; d; };	/ nasm /	{ p; d; };
 / yaboot /	{ p; d; };	/ aboot /	{ p; d; };
 / mac-fdisk /	{ p; d; };	/ pdisk /       { p; d; };
-/ linux24benh/  { p; d; };
+/ linux24benh/  { p; d; };	/ syslinux /	{ p; d; };
 
 # Disable packages which are not in base or not build in stages 0-4
 / base / !  { s/^X /O /p; d; };		/^. -----/ { s/^X /O /p; d; };
diff --git a/target/dietlibc/build.sh b/target/dietlibc/build.sh
index 10d91e0d1..1070fb2a4 100644
--- a/target/dietlibc/build.sh
+++ b/target/dietlibc/build.sh
@@ -5,3 +5,15 @@
 #
 pkgloop
 
+echo_status "Creating isofs.txt file .."
+cat << EOT > build/${ROCKCFG_ID}/isofs.txt
+DISK1   $admdir/cache/                  ${ROCKCFG_SHORTID}/info/cache/
+DISK1   $admdir/cksums/                 ${ROCKCFG_SHORTID}/info/cksums/
+DISK1   $admdir/dependencies/           ${ROCKCFG_SHORTID}/info/dependencies/
+DISK1   $admdir/descs/                  ${ROCKCFG_SHORTID}/info/descs/
+DISK1   $admdir/flists/                 ${ROCKCFG_SHORTID}/info/flists/
+DISK1   $admdir/md5sums/                ${ROCKCFG_SHORTID}/info/md5sums/
+DISK1   $admdir/packages/               ${ROCKCFG_SHORTID}/info/packages/
+EVERY   build/${ROCKCFG_ID}/packages.db ${ROCKCFG_SHORTID}/packages.db
+SPLIT   build/${ROCKCFG_ID}/pkgs/       ${ROCKCFG_SHORTID}/pkgs/
+EOT