diff --git a/SysBuild/BuildCluster/BaseSysTools.dmk b/SysBuild/BuildCluster/BaseSysTools.dmk
index 23b9b8b..d45016e 100755
--- a/SysBuild/BuildCluster/BaseSysTools.dmk
+++ b/SysBuild/BuildCluster/BaseSysTools.dmk
@@ -135,7 +135,6 @@
 0       tools/zsh
 0       tools/shed
 0       tools/minicom
-
 0       xsys/w32codec
 0       tools/divx611
 #0       tools/gcc-3
@@ -144,8 +143,9 @@
 0       tools/CDspindown
 0       tools/doxygen
 0       tools/dvd+rw-tools
-0       tools/db
+0       dbase/db
 0       tools/pks
+
 0       xsys/isdn4k-utils
 0       tools/ntp
 0       tools/amanda
diff --git a/SysBuild/tools/db b/SysBuild/dbase/db
similarity index 97%
rename from SysBuild/tools/db
rename to SysBuild/dbase/db
index 338223e..7aae441 100644
--- a/SysBuild/tools/db
+++ b/SysBuild/dbase/db
@@ -67,7 +67,7 @@
 #
 #
 
-SRCPATH=Tools/Database
+SRCPATH=/DBase/Lib
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
@@ -84,6 +84,7 @@ premk() {
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=$UARCH \
 	../db*/dist/configure --host=$TARGET32 \
 			      --build=$TARGET32 \
 			      --target=$TARGET32 \
@@ -91,7 +92,6 @@ mk32() {
 			      --enable-compat185 \
 		              --enable-cxx \
 		              --enable-tcl \
-			      --enable-java \
 		              --with-tcl=/usr/X11R7/lib \
 		              --enable-rpc &&
 	make -j $NUMCPU &&
@@ -110,13 +110,15 @@ mk() {
 	else
 		ADDOPTIONS="--with-tcl=/usr/X11R7/lib"
 	fi
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
 	../db*/dist/configure --host=$TARGET \
 	            	      --build=$TARGET \
 	            	      --target=$TARGET \
 		    	      --prefix=/usr \
             	    	      --enable-compat185 \
 	    	    	      --enable-cxx \
-	    	    	      --enable-java \
 	    	    	      --enable-tcl \
 		    	      $ADDOPTIONS \
 	    	    	      --enable-rpc &&
diff --git a/SysBuild/tools/divx611 b/SysBuild/multimedia/divx611
similarity index 99%
rename from SysBuild/tools/divx611
rename to SysBuild/multimedia/divx611
index 6a85962..9daeb93 100644
--- a/SysBuild/tools/divx611
+++ b/SysBuild/multimedia/divx611
@@ -71,7 +71,7 @@
 #
 
 #Pfad zu Basis Source Tree eintragen!
-SRCPATH=Tools/MultiMedia
+SRCPATH=MultiMedia/Lib
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
diff --git a/SysBuild/multimedia/w32codec b/SysBuild/multimedia/w32codec
index 9f8438b..ba34f93 100644
--- a/SysBuild/multimedia/w32codec
+++ b/SysBuild/multimedia/w32codec
@@ -79,6 +79,7 @@ SRCDIR=essential*
 premk() {
 	echo "Nothing to do for premk()"
 	CheckError "premk() failed !" 1
+	W32VERSION=20071007
 }
 
 mk32() {
@@ -91,15 +92,20 @@ mk32() {
 }
 
 mk() {
-	if [ "MK4BIT" == "true" ]; then
+	if [ "$MK64BIT" == "true" ]; then
 		UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/w32codec-x86_64-*.tar.bz2
 	else
 		UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/w32codec-x86-*.tar.bz2
 	fi
+	cd $MAKEDIR/$SRCDIR
 	# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
 	# Den \ nicht vergessen !
 	mkdir -p $TMPROOT/usr/$LIBDIR/win32
 	tar -cf - .|tar -C $TMPROOT/usr/$LIBDIR/win32 -xvf -
+	cd ..
+	rm -r $SRCDIR
+	PKGNAME=w32codec-$W32VERSION.tbz
+	DSTPKGNAME=w32codec-$W32VERSION
 }
 
 postmk() {
diff --git a/SysBuild/tools/pks b/SysBuild/security/pks
similarity index 98%
rename from SysBuild/tools/pks
rename to SysBuild/security/pks
index c2c08bf..59f22bc 100644
--- a/SysBuild/tools/pks
+++ b/SysBuild/security/pks
@@ -70,7 +70,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Security/Net
 
 premk() {
 	echo "Nothing to do for premk()"
@@ -86,7 +86,7 @@ mk32() {
 		    --datadir=/var/lib/pksd \
 	            --x-includes=/usr/X11R7/include/ --x-libraries=/usr/X11R7/lib \
 		    --prefix=/usr
-	make -j $NUMCPU
+	make
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
 	mv $TMPROOT/usr/lib{,-32}
@@ -102,7 +102,7 @@ mk() {
 		    --datadir=/var/lib/pksd \
 		    --libdir=/usr/$LIBDIR \
 		    --prefix=/usr
-	make -j $NUMCPU
+	make 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
diff --git a/SysBuild/tools/CDspindown b/SysBuild/tools/CDspindown
index dd52aee..9de97f7 100644
--- a/SysBuild/tools/CDspindown
+++ b/SysBuild/tools/CDspindown
@@ -78,13 +78,12 @@ premk() {
 	mkdir -p  $TMPROOT/usr/sbin
 	CheckError "premk() failed !" 1
 	echo "CDspindown:" >>Makefile
-	echo "	gcc -o CDspindown CDspindown.c /usr/lib/libc.a" >>Makefile
-	sed -e "s/extern .*errno/extern __thread int errno/" CDspindown.c >/tmp/CDspindown.c
-	mv /tmp/CDspindown.c .
+	sed -i -e "s/extern .*errno/extern __thread int errno/" CDspindown.c 
 }
 
 mk() {
 	# Make-Optionen eintragen
+	echo "	gcc -o CDspindown CDspindown.c /usr/$LIBDIR/libc.a" >>Makefile
 	make CC="gcc $BUILDOPTIONS" \
 	     CXX="gcc $BUILDOPTIONS"  &&
 	make BINDIR=$TMPROOT/usr/sbin install
diff --git a/SysBuild/tools/doxygen b/SysBuild/tools/doxygen
index 5cc96f4..0adbb5f 100644
--- a/SysBuild/tools/doxygen
+++ b/SysBuild/tools/doxygen
@@ -82,7 +82,7 @@ premk() {
 mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure --prefix /usr &&
+	./configure --prefix /usr --docdir /usr/share/doc &&
 	make -j $NUMCPU  &&
 	make -j $NUMCPU INSTALL=$TMPROOT/usr install
 	CheckError "Make install process failed !" 1
diff --git a/SysBuild/tools/dvd+rw-tools b/SysBuild/tools/dvd+rw-tools
index ea3ace1..e616cd7 100644
--- a/SysBuild/tools/dvd+rw-tools
+++ b/SysBuild/tools/dvd+rw-tools
@@ -72,16 +72,17 @@
 SRCPATH=Tools/Utilities
 
 premk() {
-	echo "Nothing to do for premk()"
+	sed -i "628i\#include <limits.h>" growisofs.c &&
+	sed -i "359i\#include <limits.h>" transport.hxx
 }
 
 mk() {
-	make CC="gcc $BUILDOPTIONS" \
-	     CXX="g++ $BUILDOPTIONS" \
-	     -j $NUMCPU
-	sed -e "s%/usr/local%$TMPROOT/usr%" Makefile.m4 >/tmp/Makefile.m4
-	mv /tmp/Makefile.m4 .
-	make install
+	make CC="gcc ${BUILDOPTIONS}" \
+	     CXX="g++ ${BUILD64}" \
+	     all rpl8 btcflash
+	make prefix=$TMPROOT/usr install &&
+	install -v -m644 -D index.html \
+	         /usr/share/doc/dvd+rw-tools-7.1/index.html
 }
 
 postmk() {