diff --git a/SysBuild/BuildCluster/BaseSysTools.dmk b/SysBuild/BuildCluster/BaseSysTools.dmk
index d45016e..91049cf 100755
--- a/SysBuild/BuildCluster/BaseSysTools.dmk
+++ b/SysBuild/BuildCluster/BaseSysTools.dmk
@@ -116,8 +116,7 @@
 0       tools/bc
 0       tools/a2ps
 0       tools/binfmt_misc
-
-0       tools/wget
+0       network/wget
 0       tools/pciutils
 0       tools/psutils
 0       tools/hdparm
@@ -131,12 +130,13 @@
 0	network/libpcap
 0       network/iftop
 0       tools/cftp
-0       tools/lame
+
+0       multimedia/lame
 0       tools/zsh
 0       tools/shed
 0       tools/minicom
-0       xsys/w32codec
-0       tools/divx611
+0       multimedia/w32codec
+0       multimedia/divx611
 #0       tools/gcc-3
 0       tools/bonnie++
 0       tools/rarlinux
@@ -144,11 +144,10 @@
 0       tools/doxygen
 0       tools/dvd+rw-tools
 0       dbase/db
-0       tools/pks
-
+0       security/pks
 0       xsys/isdn4k-utils
 0       tools/ntp
-0       tools/amanda
+
 0       tools/lynx
 #Is already done - aber hier sollte die neueste Version gebaut werden
 0	tools/subversion
@@ -171,4 +170,4 @@
 0       tools/mysql
 0       tools/openslp
 0       tools/samba
-
+0       tools/amanda
diff --git a/SysBuild/buildcfgs/isdnconfig b/SysBuild/buildcfgs/isdnconfig
index 0781597..18f4426 100644
--- a/SysBuild/buildcfgs/isdnconfig
+++ b/SysBuild/buildcfgs/isdnconfig
@@ -95,7 +95,7 @@ VBOX_LOGDIR='/var/log/vbox'
 VBOX_PIDDIR='/var/run'
 VBOX_LOCKDIR='/var/lock'
 VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.4.11'
+VBOX_TCL='tcl8.5.6'
 VBOX_SUSPEND_ID=y
 CONFIG_IPPPD=y
 
diff --git a/SysBuild/tools/lynx b/SysBuild/network/lynx
similarity index 100%
rename from SysBuild/tools/lynx
rename to SysBuild/network/lynx
diff --git a/SysBuild/tools/ntp b/SysBuild/network/ntp
similarity index 99%
rename from SysBuild/tools/ntp
rename to SysBuild/network/ntp
index 47a7b1a..3bea6a4 100644
--- a/SysBuild/tools/ntp
+++ b/SysBuild/network/ntp
@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Servers
 
 premk() {
 	echo "Nothing to do for premk()"
diff --git a/SysBuild/xsys/isdn4k-utils b/SysBuild/tools/isdn4k-utils
similarity index 93%
rename from SysBuild/xsys/isdn4k-utils
rename to SysBuild/tools/isdn4k-utils
index 11e7886..70464db 100644
--- a/SysBuild/xsys/isdn4k-utils
+++ b/SysBuild/tools/isdn4k-utils
@@ -67,7 +67,7 @@
 #
 #
 
-SRCPATH=X11/System
+SRCPATH=Tools/System
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
@@ -88,28 +88,32 @@ mk() {
 	cp $VMAKEDIR/SysBuild/buildcfgs/isdnconfig .config
 	yes "E"|make -k config 
 	cd vbox
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
 	./configure --with-tcldir=/usr/X11R7 \
 	            --with-sysconfdir=/etc/sysconfig/isdn
 	if [ "$MK64BIT" == "true" ]; then
-		sed -e "s%/lib%/lib64%" src/Makefile >Makefile~
-		mv Makefile~ src/Makefile
+		sed -i -e "s%/lib%/lib64%" src/Makefile
 	fi
 	cd ..
-	make -k CC="/opt/gcc-3/bin/gcc"
-	make -k CC="/opt/gcc-3/bin/gcc" DESTDIR=$TMPROOT install
+	make -k CC="gcc $BUILDOPTIONS"
+	make -k CC="gcc $BUILDOPTIONS" DESTDIR=$TMPROOT install
 	bzip2 -d -c $LFSSOURCE/$SRCPATH/isdn4k-utils*.patch.*|patch -p 1
 	cd ipppd
-	make CC=/opt/gcc-3/bin/gcc
+	make CC="gcc $BUILDOPTIONS" 
 	make DESTDIR=$TMPROOT install
 	cd ../vbox
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
 	./configure --prefix=/usr \
 	            --sysconfdir=/etc/sysconfig/isdn \
 		    --mandir=/usr/share/man \
 		    --sbindir=/sbin \
 		    --with-tcldir=/usr/X11R7
 	if [ "$MK64BIT" == "true" ]; then
-		sed -e "s%/lib%/lib64%" src/Makefile >Makefile~
-		mv Makefile~ src/Makefile
+		sed -i -e "s%/lib%/lib64%" src/Makefile
 	fi
 	make
 	make DESTDIR=$TMPROOT install