diff --git a/SysBuild/BuildCluster/BaseLibs.dmk b/SysBuild/BuildCluster/BaseLibs.dmk
index 0c92b7c..eb7b90b 100644
--- a/SysBuild/BuildCluster/BaseLibs.dmk
+++ b/SysBuild/BuildCluster/BaseLibs.dmk
@@ -2,7 +2,6 @@
 0	tools/libevent
 0       tools/libusb
 0       tools/libpng
-0	tools/pdflib
 0       tools/parted
 0	tools/libdaemon
 0       multimedia/libmad
@@ -17,8 +16,7 @@
 0	multimedia/alsa-firmware
 0	multimedia/alsa-utils
 0	multimedia/alsa-oss
-0       tools/bluez-libs
-0       multimedia/libsidplay
+0       multimedia/sidplay-libs
 0       tools/libraw1394
 0       tools/libavc1394
 0       tools/libiec61883
@@ -40,10 +38,11 @@
 0       tools/libghttp
 0       tools/jpegsrc
 0       tools/lcms
+0       tools/lcms2
 0	tools/fftw
 0       tools/libmng
-0       tools/glib-2
-0	tools/glib-1
+0       tools/glib
+0       tools/bluez
 0	tools/glibmm
 0       tools/libIDL
 0	multimedia/libmpeg2
diff --git a/SysBuild/BuildCluster/Tools.dmk b/SysBuild/BuildCluster/Tools.dmk
index bbe8a25..656823d 100644
--- a/SysBuild/BuildCluster/Tools.dmk
+++ b/SysBuild/BuildCluster/Tools.dmk
@@ -55,9 +55,7 @@
 0	development/gdb
 0	development/cvs
 0	development/ruby
-0	tools/bluez-utils
 0	tools/bluez-hcidump
-0	tools/bluez-firmware
 0	tools/dump
 0	tools/lha
 0	tools/plugz
@@ -75,6 +73,7 @@
 0	security/gnupg
 0	network/udns
 0	network/obexftp
+0	tools/obexd
 0	tools/openjade
 0	tools/gperf
 0	guibased/xcb-util
diff --git a/SysBuild/BuildCluster/XBaseLibs.dmk b/SysBuild/BuildCluster/XBaseLibs.dmk
index 142eca2..242f6b1 100644
--- a/SysBuild/BuildCluster/XBaseLibs.dmk
+++ b/SysBuild/BuildCluster/XBaseLibs.dmk
@@ -26,7 +26,6 @@
 0	guibased/pango
 0	guibased/jasper
 0	guibased/gtk+-2
-0	guibased/gtk+-1
 0	guibased/cairomm
 0	guibased/pangomm
 0	guibased/gtkmm
diff --git a/SysBuild/BuildCluster/XTools.dmk b/SysBuild/BuildCluster/XTools.dmk
index a81f01b..5a50cc5 100644
--- a/SysBuild/BuildCluster/XTools.dmk
+++ b/SysBuild/BuildCluster/XTools.dmk
@@ -13,6 +13,7 @@
 0	tools/ttf2fft
 0	tools/mtools
 0	development/jdk
+0	tools/PDFlib-Lite
 0	network/tightvnc
 0	development/boost-jam
 0	tools/boost
diff --git a/SysBuild/development/libffi b/SysBuild/development/libffi
index 16ca7a3..5aa2f34 100644
--- a/SysBuild/development/libffi
+++ b/SysBuild/development/libffi
@@ -88,13 +88,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/alsa-firmware b/SysBuild/multimedia/alsa-firmware
index 7b0917e..489c4ca 100644
--- a/SysBuild/multimedia/alsa-firmware
+++ b/SysBuild/multimedia/alsa-firmware
@@ -78,13 +78,10 @@ premk() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/alsa-lib b/SysBuild/multimedia/alsa-lib
index d2493c0..1688775 100644
--- a/SysBuild/multimedia/alsa-lib
+++ b/SysBuild/multimedia/alsa-lib
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/alsa-oss b/SysBuild/multimedia/alsa-oss
index 6cd780c..6337e36 100644
--- a/SysBuild/multimedia/alsa-oss
+++ b/SysBuild/multimedia/alsa-oss
@@ -77,14 +77,25 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=32 \
+	./configure --target=$TARGET \
+		    --libdir=\${prefix}/${LIBDIR} \
+		    --prefix=/usr \
+		    --disable-xmlto
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make distclean
+}
+
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --disable-xmlto
 	make -j $NUMCPU
diff --git a/SysBuild/multimedia/flac b/SysBuild/multimedia/flac
index 6a643a2..048862e 100644
--- a/SysBuild/multimedia/flac
+++ b/SysBuild/multimedia/flac
@@ -89,15 +89,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-		export LDFLAGS="-L/lib64 -L/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR}" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-	 	    $ADDOPTIONS \
+	 	    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/id3lib b/SysBuild/multimedia/id3lib
index 4ccbe09..ea195f9 100644
--- a/SysBuild/multimedia/id3lib
+++ b/SysBuild/multimedia/id3lib
@@ -85,23 +85,18 @@ mk32() {
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
-	GenDynLib32 $TMPROOT/usr/lib/libid3.a 3.8.3
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-		export LDFLAGS="-L/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
+	LDFLAGS="-L/usr/${LIBDIR}" \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	GenDynLib $TMPROOT/usr/$LIBDIR/libid3.a 3.8.3
 }
 
 postmk() {
diff --git a/SysBuild/multimedia/libao b/SysBuild/multimedia/libao
index b18351b..4c56d7b 100644
--- a/SysBuild/multimedia/libao
+++ b/SysBuild/multimedia/libao
@@ -93,15 +93,12 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --with-gnu-ld \
 		    --enable-arts && 
 	make -j $NUMCPU &&
diff --git a/SysBuild/multimedia/libdvdcss b/SysBuild/multimedia/libdvdcss
index e8d8248..289a303 100644
--- a/SysBuild/multimedia/libdvdcss
+++ b/SysBuild/multimedia/libdvdcss
@@ -96,15 +96,12 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
                     --with-dvdscc=local-shared \
                     --enable-fb \
                     --enable-ncurses &&
diff --git a/SysBuild/multimedia/libdvdread b/SysBuild/multimedia/libdvdread
index 9833744..57947e6 100644
--- a/SysBuild/multimedia/libdvdread
+++ b/SysBuild/multimedia/libdvdread
@@ -92,14 +92,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr/ && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
diff --git a/SysBuild/multimedia/libeXosip2 b/SysBuild/multimedia/libeXosip2
index de6e7af..e77c764 100644
--- a/SysBuild/multimedia/libeXosip2
+++ b/SysBuild/multimedia/libeXosip2
@@ -86,13 +86,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libfame b/SysBuild/multimedia/libfame
index 63c85a5..0b5b6b1 100644
--- a/SysBuild/multimedia/libfame
+++ b/SysBuild/multimedia/libfame
@@ -94,24 +94,19 @@ mk32() {
 	make distclean
 	ClearHostSysNameing32 $TMPROOT
 	mv $TMPROOT/usr/bin/libfame-config{,-32}
-	GenDynLib32 $TMPROOT/usr/lib/libfame.a 0.9.1
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 	    	    --enable-mmx && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
-	GenDynLib $TMPROOT/usr/$LIBDIR/libfame.a 0.9.1
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
diff --git a/SysBuild/multimedia/libid3tag b/SysBuild/multimedia/libid3tag
index 14dc842..6670308 100644
--- a/SysBuild/multimedia/libid3tag
+++ b/SysBuild/multimedia/libid3tag
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=32 \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/liblo b/SysBuild/multimedia/liblo
index c48c82d..92a4494 100644
--- a/SysBuild/multimedia/liblo
+++ b/SysBuild/multimedia/liblo
@@ -92,7 +92,7 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libmad b/SysBuild/multimedia/libmad
index 71747b6..5fa4de7 100644
--- a/SysBuild/multimedia/libmad
+++ b/SysBuild/multimedia/libmad
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libmikmod b/SysBuild/multimedia/libmikmod
index e56a6cf..8b765b4 100644
--- a/SysBuild/multimedia/libmikmod
+++ b/SysBuild/multimedia/libmikmod
@@ -88,30 +88,23 @@ mk32() {
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
 	mv $TMPROOT/usr/bin/libmikmod-config{,-32}
-	GenDynLib32 $TMPROOT/usr/lib/libmikmod.a 3.1.12
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	GenDynLib $TMPROOT/usr/$LIBDIR/libmikmod.a 3.1.12
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	mkdir -p $TMPROOT/usr/share
-	mv $TMPROOT/usr/man $TMPROOT/usr/share
 	if [ "$MK64BIT" == "true" ]; then
 		mv $TMPROOT/usr/bin/libmikmod-config{,-64}
 		ln -s multiarch_wrapper $TMPROOT/usr/bin/libmikmod-config
diff --git a/SysBuild/multimedia/libmpeg2 b/SysBuild/multimedia/libmpeg2
index 14b7e30..4a52095 100644
--- a/SysBuild/multimedia/libmpeg2
+++ b/SysBuild/multimedia/libmpeg2
@@ -88,13 +88,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libmpeg3 b/SysBuild/multimedia/libmpeg3
index 96d536e..77ab221 100644
--- a/SysBuild/multimedia/libmpeg3
+++ b/SysBuild/multimedia/libmpeg3
@@ -71,7 +71,7 @@
 #
 
 #Pfad zu Basis Source Tree eintragen!
-SRCPATH=MultiMedia/Apps
+SRCPATH=MultiMedia/Lib
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
@@ -84,9 +84,8 @@ premk() {
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
 	./configure
-	make depend
 	make
-	make PREFIX=$TMPROOT/usr install
+	make DST=$TMPROOT/usr/bin install
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
diff --git a/SysBuild/multimedia/libogg b/SysBuild/multimedia/libogg
index aed2c8e..c54378f 100644
--- a/SysBuild/multimedia/libogg
+++ b/SysBuild/multimedia/libogg
@@ -91,14 +91,11 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET32 \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr \
 		    --with-gnu-ld  && 
 	make -j $NUMCPU &&
diff --git a/SysBuild/multimedia/libosip2 b/SysBuild/multimedia/libosip2
index cb11a7e..1fb6ffa 100644
--- a/SysBuild/multimedia/libosip2
+++ b/SysBuild/multimedia/libosip2
@@ -85,13 +85,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libsamplerate b/SysBuild/multimedia/libsamplerate
index 8830aaf..a6173a9 100644
--- a/SysBuild/multimedia/libsamplerate
+++ b/SysBuild/multimedia/libsamplerate
@@ -88,14 +88,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libvorbis b/SysBuild/multimedia/libvorbis
index ef6d4d8..5c9d13f 100644
--- a/SysBuild/multimedia/libvorbis
+++ b/SysBuild/multimedia/libvorbis
@@ -93,14 +93,11 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr \
 		    --with-gnu-ld && 
 	sed -e "s/ -mieee-fp/ /" examples/Makefile >/tmp/Makefile
diff --git a/SysBuild/multimedia/mp4v2 b/SysBuild/multimedia/mp4v2
index 98fd960..a62b170 100644
--- a/SysBuild/multimedia/mp4v2
+++ b/SysBuild/multimedia/mp4v2
@@ -85,13 +85,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/libsidplay b/SysBuild/multimedia/sidplay-libs
similarity index 94%
rename from SysBuild/multimedia/libsidplay
rename to SysBuild/multimedia/sidplay-libs
index a3cc398..c80217a 100644
--- a/SysBuild/multimedia/libsidplay
+++ b/SysBuild/multimedia/sidplay-libs
@@ -58,8 +58,8 @@
 # 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
 #         kümmern
 
-#Module zur Erstellung des Packetes: libsidplay
-#Quelle der Source Archive: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html
+#Module zur Erstellung des Packetes: sidplay-libs
+#Quelle der Source Archive: http://sidplay2.sourceforge.net/
 #Kurzbeschreibung: Library für sidplay und xsidplay, Programme zum Abspielen von c64 Musik
 #
 #
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-	            $ADDOPTIONS \
+	            --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/taglib b/SysBuild/multimedia/taglib
index adc12fb..d0aeeec 100644
--- a/SysBuild/multimedia/taglib
+++ b/SysBuild/multimedia/taglib
@@ -92,13 +92,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --enable-mp4 \
 		    --enable-asf
diff --git a/SysBuild/multimedia/xvidcore b/SysBuild/multimedia/xvidcore
index 733e7a9..d37b275 100644
--- a/SysBuild/multimedia/xvidcore
+++ b/SysBuild/multimedia/xvidcore
@@ -77,15 +77,22 @@ premk() {
 
 mk32() {
 	cd build/generic
-	./configure 
-	make CC="gcc $BUILDOPTIONS32" USE_ARCH=32 -j $NUMCPU
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32"\
+	USE_ARCH=32 \
+	./configure --target=$TARGET32 \
+	            --prefix=/usr 
+	make CC="gcc $BUILDOPTIONS32" USE_ARCH=32 LDEMULATION=elf_i386 -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr install
 	make distclean
 }
 
 mk() {
 	cd build/generic
-	./configure 
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	./configure --prefix=/usr \
+	            --libdir=/usr/${LIBDIR}
 	make CC="gcc $BUILDOPTIONS" USE_ARCH=$UARCH -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr libdir=$TMPROOT/usr/$LIBDIR install
 }
diff --git a/SysBuild/network/libidn b/SysBuild/network/libidn
index e587f82..f2a55b3 100644
--- a/SysBuild/network/libidn
+++ b/SysBuild/network/libidn
@@ -82,7 +82,7 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=$UARCH \
 	../libidn*/configure --host=$TARGET32 \
-		    --prefix=/usr
+			     --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	cd ../libidn*
@@ -92,15 +92,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	../libidn*/configure --host=$TARGET \
-		    $ADDOPTIONS \
-		    --prefix=/usr
+			     --libdir=/usr/${LIBDIR} \
+			     --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
diff --git a/SysBuild/network/libnet b/SysBuild/network/libnet
index ccac7be..75bfa38 100644
--- a/SysBuild/network/libnet
+++ b/SysBuild/network/libnet
@@ -59,7 +59,7 @@
 #         kümmern
 
 #Module zur Erstellung des Packetes: 
-#Quelle der Source Archive: http://libnet.sourceforge.net (outdated) -> http://www.packetfactory.net/libnet/dist/
+#Quelle der Source Archive: http://packetfactory.openwall.net/projects/libnet/
 #ACHTUNG: Beschreibung nicht in der gleichen Zeile beginnen!
 #Neue Zeile anfangen. sonste funktioniert die metadaten erzeugung
 #nicht!
@@ -92,14 +92,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/network/srtp b/SysBuild/network/srtp
index 57f50d8..220682e 100644
--- a/SysBuild/network/srtp
+++ b/SysBuild/network/srtp
@@ -96,9 +96,6 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\$(DESTDIR)/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="gcc $BUILDOPTIONS -fPIC" \
 	./configure --target=$TARGET \
diff --git a/SysBuild/security/integrit b/SysBuild/security/integrit
index 843d84a..ab18739 100644
--- a/SysBuild/security/integrit
+++ b/SysBuild/security/integrit
@@ -83,10 +83,7 @@ premk() {
 mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure --host=$TARGET \
-	            --build=$TARGET \
-		    --target=$TARGET \
-        	    --prefix=/usr
+	./configure --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr install
 	CheckError "Make install process failed !" 1
diff --git a/SysBuild/security/libgcrypt b/SysBuild/security/libgcrypt
index 0c17214..c2bbfeb 100644
--- a/SysBuild/security/libgcrypt
+++ b/SysBuild/security/libgcrypt
@@ -88,14 +88,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --build=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/security/libgpg-error b/SysBuild/security/libgpg-error
index dfa53f6..dbdb059 100644
--- a/SysBuild/security/libgpg-error
+++ b/SysBuild/security/libgpg-error
@@ -88,14 +88,11 @@ mk32() {
 } 
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/security/openssl b/SysBuild/security/openssl
index dbe568d..ff67e8b 100644
--- a/SysBuild/security/openssl
+++ b/SysBuild/security/openssl
@@ -70,9 +70,6 @@
 
 SRCPATH=Security/Lib
 
-(( MKPKG = $MKPKG | 4 ))
-(( MKPKG = $MKPKG | 128 ))
-
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
@@ -82,51 +79,42 @@ premk() {
 }
 
 mk32() {
-	tar -C $MAKEDIR -xvf $LFSSOURCE/$SRCPATH/openssl-*.tar.*
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-32bit_x86_64-*.patch.*
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-fix_manpages-*.patch.*
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-build_fix-*.patch.*
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-mips_support-*.patch.*
-	cd $MAKEDIR/openssl*
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=$UARCH \
-	./Configure linux-x86_64-32 \
-	            --openssldir=/etc/sysconfig/ssl \
+	./Configure --openssldir=/etc/ssl \
 	            --prefix=/usr \
-		    shared 
-	make -j $NUMCPU MANDIR=/usr/share/man
-	make INSTALL_PREFIX=$TMPROOT MANDIR=/usr/share/man install
-	cd ..
-	rm -r $MAKEDIR/openssl*
+		    -shared \
+		    linux-generic32
+	make CC="gcc $BUILDOPTIONS32" \
+	     CXX="g++ $BUILDOPTIONS32" \
+	     LDEMULATION=elf_i386 
+	make CC="gcc $BUILDOPTIONS32" \
+	     CXX="g++ $BUILDOPTIONS32" \
+	     LDEMULATION=elf_i386 \
+	     INSTALL_PREFIX=$TMPROOT install
+	make clean
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	tar -C $MAKEDIR -xvf $LFSSOURCE/$SRCPATH/openssl-*.tar.*
-	if [ "$MK64BIT" == "true" ]; then
-		SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-allow_lib64-*.patch.*
-		SYSTYPE=linux-x86_64
-		mv $TMPROOT/usr/lib $TMPROOT/usr/lib32
-		mkdir -p $TMPROOT/usr/lib64/engines
-		ln -s lib64/engines $TMPROOT/usr/engines
-		ln -s lib64 $TMPROOT/usr/lib
-	else
-		SYSTYPE=linux-generic32 
-	fi
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-fix_manpages-*.patch.*
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-build_fix-*.patch.*
-	SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-mips_support-*.patch.*
-	cd $MAKEDIR/openssl*
+	CC="gcc $BUILDOPTIONS -fPIC" \
+	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
-	./Configure $SYSTYPE \
-	            --openssldir=/etc/sysconfig/ssl \
-	            --prefix=/usr \
-		    shared 
-	make MANDIR=/usr/share/man
-	make INSTALL_PREFIX=$TMPROOT MANDIR=/usr/share/man install
-	cp -v -r certs $TMPROOT/etc/sysconfig/ssl
-	install -v -d -m755 $TMPROOT/usr/share/doc/openssl-0.9.8k &&
+	./config --openssldir=/etc/ssl \
+	         --prefix=/usr \
+		 shared 
+	make CC="gcc $BUILDOPTIONS -fPIC" \
+	     CXX="g++ $BUILDOPTIONS -fPIC" 
+	make CC="gcc $BUILDOPTIONS -fPIC" \
+	     CXX="gcc $BUILDOPTIONS -fPIC" \
+	     INSTALL_PREFIX=$TMPROOT \
+	     LIBDIR=${LIBDIR} \
+	     install
+	cp -v -r certs $TMPROOT/etc/ssl
+	install -v -d -m755 $TMPROOT/usr/share/doc/openssl-1.0.0d &&
 	cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
-	    $TMPROOT/usr/share/doc/openssl-0.9.8k
+	    $TMPROOT/usr/share/doc/openssl-1.0.0d
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
diff --git a/SysBuild/tools/pdflib b/SysBuild/tools/PDFlib-Lite
similarity index 83%
rename from SysBuild/tools/pdflib
rename to SysBuild/tools/PDFlib-Lite
index 762f00e..29dd1c0 100644
--- a/SysBuild/tools/pdflib
+++ b/SysBuild/tools/PDFlib-Lite
@@ -56,7 +56,7 @@
 #	  frisch installierten Packet verwendet (wie z.B. postgresql)
 # 64	: sourcetree aufräumen nach packeterstellung unterbinden.
 #
-#Module zur Erstellung des Packetes: pdflib
+#Module zur Erstellung des Packetes: PDFlib-Lite
 #Quelle der Source Archive: www.pdflib.com/bibel
 #Kurzbeschreibung:
 #Support Library für das Acrobat Document Format PDF
@@ -76,9 +76,7 @@ SRCDIR=PDFlib
 
 
 premk() {
-	mkdir -p $TMPROOT/usr/X11R7/bin
 	echo "Nothing to do for premk()"
-	CheckError "premk() failed !" 1
 }
 
 mk32() {
@@ -87,42 +85,32 @@ mk32() {
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/usr/lib" \
 	./configure --build=$TARGET32 \
-        	    --prefix=/usr/X11R7 \
+        	    --prefix=/usr \
 		    --with-gnu-ld \
 		    --enable-php \
 		    --enable-cxx \
-		    --with-perl=/usr/bin/perl \
-		    --with-py=/usr/bin/python \
-		    --with-tcl=/usr/X11R7/bin/tclsh &&
-	make -j $NUMCPU LDEMULATION=elf32_i386 &&
-	make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install &&
+		    --with-perl=/usr/bin/perl 
+	make -j $NUMCPU LDEMULATION=elf32_i386
+	make -j $NUMCPU prefix=$TMPROOT/usr install &
 	make distclean
 	mv $TMPROOT/usr/X11R7/bin/pdflib-config{,-32}
-	GenDynLib32 $TMPROOT/usr/X11R7/lib/libpdf.a 6.0.3
+	#GenDynLib32 $TMPROOT/usr/X11R7/lib/libpdf.a 6.0.3
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/usr/lib64" \
-	./configure --host=$TARGET \
-	            --build=$TARGET \
-	            --target=$TARGET \
-        	    --prefix=/usr/X11R7 \
-		    $ADDOPTIONS \
+	./configure --prefix=/usr \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --with-gnu-ld \
 		    --enable-php \
 		    --enable-cxx \
-		    --with-perl=/usr/bin/perl \
-		    --with-py=/usr/bin/python \
-		    --with-tcl=/usr/X11R7/bin/tclsh &&
-	make -j $NUMCPU &&
-	make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install &&
-	GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libpdf.a 6.0.3
+		    --with-perl=/usr/bin/perl 
+	make -j $NUMCPU 
+	make -j $NUMCPU prefix=$TMPROOT/usr install
+	#GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libpdf.a 6.0.3
 }
 
 postmk() {
diff --git a/SysBuild/tools/glib-1 b/SysBuild/tools/bluez
similarity index 68%
rename from SysBuild/tools/glib-1
rename to SysBuild/tools/bluez
index 070544f..8f7b298 100644
--- a/SysBuild/tools/glib-1
+++ b/SysBuild/tools/bluez
@@ -1,9 +1,9 @@
 #!/bin/bash
 #Framework, welches ein komplettes Linux System aus den Sourcen erstellt
 #dieses Framework wird im CVS Repository
-#:pserver:cvs.tramp-bbs.de:/opt/cvs zur Verfügung gestellt
+#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt
 #
-#Lage dieser Datei im Archiv: $HeadURL: svn://svn.compuextreme.de/Viitor/V963/ViitorMake/SysBuild/tools/glib-1 $
+#Lage dieser Datei im Archiv: $HeadURL: svn://svn.compuextreme.de/Viitor/V963/ViitorMake/SysBuild/tools/bluez-libs $
 #
 #(c) 2003 Harald Kueller, Germany
 #This program is free software; you can redistribute it and/or
@@ -55,73 +55,51 @@
 #	  Wichtig bei packeten mit postinstallroutine, die software aus dem 
 #	  frisch installierten Packet verwendet (wie z.B. postgresql)
 # 64	: sourcetree aufräumen nach packeterstellung unterbinden.
-#
-#Module zur Erstellung des Packetes: glib-1
-#Quelle der Source Archive: ftp://ftp.gtk.org/pub/gtk
+# 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
+#         kümmern
+
+#Module zur Erstellung des Packetes: 
+#Quelle der Source Archive: http://www.bluez.org/
 #Kurzbeschreibung:
-#Ältere Version der Support Library für das GIMP Tool Kit
+#libraries for bluez
+#
 #
 #Letzte Änderung von: $Author$
-#Datum der letzten Änderung: $Date: 2009-07-22 09:39:07 +0200 (Mi, 22 Jul 2009) $
+#Datum der letzten Änderung: $Date: 2009-05-20 12:04:23 +0200 (Mi, 20 Mai 2009) $
 #Version der Datei: $Rev$
 #
 #
 
 SRCPATH=Tools/Lib
 
-#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
-#ausgeführt (sprich unpack src; cd src; premk)
-#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
-
 premk() {
 	echo "Nothing to do for premk()"
 }
 
 mk32() {
-	CC="gcc $BUILDOPTIONS32 -fPIC" \
-	CXX="g++ $BUILDOPTIONS32 -fPIC" \
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=$UARCH \
-	./configure --build=$TARGET32 \
-		    --with-libiconv \
-		    --prefix=/usr && 
-	make -j $NUMCPU 
-	make -j $NUMCPU DESTDIR=$TMPROOT install 
+	./configure --host=$TARGET32 \
+		    --prefix=/usr \
+		    --sysconfdir=/etc
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
-	for i in libglib.a \
-		 libgthread.a \
-		 libgmodule.a ; do
-		 GenDynLib32 $TMPROOT/usr/lib/$i 1.2.10
-	done
-	mv $TMPROOT/usr/bin/glib-config{,-32}
-	
 }
 
-#Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
-	CC="gcc $BUILDOPTIONS -fPIC" \
-	CXX="g++ $BUILDOPTIONS -fPIC" \
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure --build=$TARGET \
-		    --with-libiconv \
-		    $ADDOPTIONS \
-		    --prefix=/usr && 
-	make -j $NUMCPU 
-	make -j $NUMCPU DESTDIR=$TMPROOT install 
-	for i in libglib.a \
-		 libgthread.a \
-		 libgmodule.a ; do
-		 GenDynLib $TMPROOT/usr/$LIBDIR/$i 1.2.10
-	done
+	./configure --host=$TARGET \
+		    --libdir=/usr/${LIBDIR} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
-#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
-#in $TMPROOT noch einiges korrigieren
 postmk() {
-	if [ "$MK64BIT" == "true" ]; then
-		mv $TMPROOT/usr/bin/glib-config{,-64}
-		ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/glib-config
-	fi
+	echo "Nothing to do for postmk()"
 }
diff --git a/SysBuild/tools/exiv2 b/SysBuild/tools/exiv2
index c23105d..bd56f83 100644
--- a/SysBuild/tools/exiv2
+++ b/SysBuild/tools/exiv2
@@ -88,13 +88,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/fam b/SysBuild/tools/fam
index 347c454..f5740ee 100644
--- a/SysBuild/tools/fam
+++ b/SysBuild/tools/fam
@@ -76,11 +76,12 @@ premk() {
 	libtoolize && \
 	autoreconf && \
 	sed -i -e s/NULL/0/g src/Interest.h
+	echo "Nothing to do for premk()"
 }
 
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32 -fabi-version=0" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET32 \
 		    --prefix=/usr \
@@ -91,15 +92,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS -fabi-version=0" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --sysconfdir=/etc
 	make -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr sysconfdir=$TMPROOT/etc install
diff --git a/SysBuild/tools/fftw b/SysBuild/tools/fftw
index af251bf..e72ae08 100644
--- a/SysBuild/tools/fftw
+++ b/SysBuild/tools/fftw
@@ -100,13 +100,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --enable-threads \
 		    --enable-shared
@@ -116,7 +113,7 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --enable-threads \
 		    --enable-float \
diff --git a/SysBuild/tools/fribidi b/SysBuild/tools/fribidi
index 6f053a6..aeb5020 100644
--- a/SysBuild/tools/fribidi
+++ b/SysBuild/tools/fribidi
@@ -84,28 +84,27 @@ mk32() {
 	./configure --prefix=/usr \
 	            --enable-shared
 	make -j $NUMCPU
-	GenDynLib32 `pwd`/.libs/libfribidi.a 0.0.0
-	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mv $TMPROOT/usr/bin/fribidi-config{,-32}
 	make distclean
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --enable-shared
 	make -j $NUMCPU
-	GenDynLib `pwd`/.libs/libfribidi.a 0.0.0
+#	GenDynLib `pwd`/.libs/libfribidi.a 0.0.0
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ $MK64BIT == "true" ]; then
+		mv $TMPROOT/usr/bin/fribidi-config{,-64}
+		ln -s multiarch_wrapper $TMPROOT/usr/bin/fribidi-config
+	fi
 }
diff --git a/SysBuild/tools/glib-2 b/SysBuild/tools/glib
similarity index 98%
rename from SysBuild/tools/glib-2
rename to SysBuild/tools/glib
index d28c50a..061bf0d 100644
--- a/SysBuild/tools/glib-2
+++ b/SysBuild/tools/glib
@@ -95,15 +95,12 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
                     --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 	            --with-libiconv=gnu \
 	            --with-gnu-ld &&
 	make -j $NUMCPU &&
diff --git a/SysBuild/tools/glibmm b/SysBuild/tools/glibmm
index ddd4cdc..233f859 100644
--- a/SysBuild/tools/glibmm
+++ b/SysBuild/tools/glibmm
@@ -96,7 +96,7 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
         	    --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU  DESTDIR=$TMPROOT install &&
diff --git a/SysBuild/tools/ilmbase b/SysBuild/tools/ilmbase
index 3cf5681..812b371 100644
--- a/SysBuild/tools/ilmbase
+++ b/SysBuild/tools/ilmbase
@@ -91,7 +91,7 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/jpegsrc b/SysBuild/tools/jpegsrc
index 17374e2..03bac47 100644
--- a/SysBuild/tools/jpegsrc
+++ b/SysBuild/tools/jpegsrc
@@ -57,7 +57,7 @@
 # 64	: sourcetree aufräumen nach packeterstellung unterbinden.
 #
 #Module zur Erstellung des Packetes: jpegsrc
-#Quelle der Source Archive: Unknown
+#Quelle der Source Archive: www.ijg.org
 #Kurzbeschreibung:
 #Supportfunktionen zur Verarbeitung von JPEG Bild Informationen
 #
@@ -76,11 +76,7 @@ SHNAMELIST="jpegbin"
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
 
 premk() {
-	mkdir -p $TMPROOT/usr/include $TMPROOT/usr/lib \
-		$TMPROOT/usr/bin $TMPROOT/usr/man/man1
-	if [ "$MK64BIT" == "true" ]; then
-		mkdir $TMPROOT/usr/lib64
-	fi
+	echo "Nothing to do for premk()"
 }
 
 mk32() {
@@ -93,44 +89,30 @@ mk32() {
 		    --enable-shared && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install 
-	make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-lib
-	make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-headers 
 	cp jmemsys.h $TMPROOT/usr/include
 	make distclean
-	GenDynLib32 $TMPROOT/usr/lib/libjpeg.a 62.0.0
-	ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib/libjpeg6b.so.62.0.0
-	ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib/libjpeg6b.so.62.0
-	ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib/libjpeg6b.so.62
+	ClearHostSysNameing32 $TMPROOT
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	LDFLAGS="-fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --enable-static \
 		    --enable-shared && 
 	make -j $NUMCPU libdir=/usr/$LIBDIR &&
 	make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install 
-	make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-lib
-	make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-headers 
 	cp jmemsys.h $TMPROOT/usr/include
-	GenDynLib $TMPROOT/usr/$LIBDIR/libjpeg.a 62.0.0
-	ln -s libjpeg.so.62.0.0 $TMPROOT/usr/$LIBDIR/libjpeg6b.so.62.0.0
-	ln -s libjpeg.so.62.0.0 $TMPROOT/usr/$LIBDIR/libjpeg6b.so.62.0
-	ln -s libjpeg.so.62.0.0 $TMPROOT/usr/$LIBDIR/libjpeg6b.so.62
+	ClearHostSysNameing $TMPROOT
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	mkdir -p usr/share
-	mv usr/man usr/share
+	echo "Nothing to do for postmk()"
 }
diff --git a/SysBuild/tools/lcms b/SysBuild/tools/lcms
index 7ba851c..2a38790 100644
--- a/SysBuild/tools/lcms
+++ b/SysBuild/tools/lcms
@@ -84,18 +84,15 @@ mk32() {
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	ClearHostSysNameing32 $TMPROOT
-	find . -name "*.o" -exec rm {} \;
+	make distclean
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/lcms2 b/SysBuild/tools/lcms2
new file mode 100644
index 0000000..a0f4fe6
--- /dev/null
+++ b/SysBuild/tools/lcms2
@@ -0,0 +1,104 @@
+#!/bin/bash
+#Framework, welches ein komplettes Linux System aus den Sourcen erstellt
+#dieses Framework wird im CVS Repository
+#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt
+#
+#Lage dieser Datei im Archiv: $HeadURL: svn://svn.compuextreme.de/Viitor/V963/ViitorMake/SysBuild/tools/lcms $
+#
+#(c) 2003 Harald Kueller, Germany
+#This program is free software; you can redistribute it and/or
+#modify ist 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.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#See the GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not write to the Free Software Foundation,
+#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#Dies ist ein Module zur Verwendung mit genpkg. Die Erzeugung eines
+#Viitor Linux Packetes wird über die Funktionen premk, mk und postmk
+#gesteuert. premk() dient zur Vorbereitung des Sourcecodes. Hier können
+#diverse Änderungen am sourcecode (mit awk/sed usw.) vorgenommen werden
+#mk() umfasst die source Konfiguration und das Übersetzten des source
+#codes. Auch die Installation muß von mk erledigt werden. Hier gild dass
+#die Installation immer nach $TMPROOT erfolgen soll (meisst kann das mit
+#"make DESTDIR=$TMPROOT install" angestossen werden). postmk kann 
+#vor der packeterstellung noch einiges am installationtree ändern. postmk
+#läuft nachdem die Packetabhängigkeiten erstellt wurden.
+#Das Verhalten von genpkg kann über die Variable MKPKG gesteuert werden.
+#Hier müssen FLAGS zur Steuerung gesetzt werden. Folgende Flags werden
+#erkannt:
+#
+#  1	: Package Erzeugung erzwingen. Packet wird, auch wenn es schon
+#	  vorhanden ist, ohne weitere rückfragen neu Erzeugt.
+#  2	: Package Installation erzwingen. Installpkg wird mit -f aufgerufen.
+#	  Das bewirkt, das installpkg keine rückfragen bei der installation
+#	  Stellt, und das packet in jedemfall (neu) installiert.
+#  4	: Sourcepacket nicht nach MAKEDIR entpacken. Ist dieses Flag gesetzt
+#	  muss sich das Module selber um das Entpacken der sourcedateien kümmern.
+#	  vor allem wichtig bei Packeten, für die es keine source.tgz gibt
+#	  (z.B. aus dem CVS generierte Packete).
+#  8	: Erstellung des Packetes aus $TMPROOT wird unterdrückt. Dies ist bei 
+#	  manchen Sonderfällen möglich - wenn sich z.B. der Packetnamen nicht 
+#	  aus dem Namen des sourcearchives ableiten lässt. Packet sollte in
+#	  so einem Fall in der postmk() Funktion erstellt werden.
+# 16	: Packet wird nicht installiert. Bei Packeten wie tar oder bash kann
+#	  die installation mittelst installpkg probleme machen.
+# 32	: Dependics File so erzeugen, das die Abhängigkeiten bei der installation
+#	  erfüllt sein müssen. installpkg bricht in so einem fall bei fehlenden
+#	  packeten die installation ab, und gibt nicht "nur" warnmeldungen aus.
+#	  Wichtig bei packeten mit postinstallroutine, die software aus dem 
+#	  frisch installierten Packet verwendet (wie z.B. postgresql)
+# 64	: sourcetree aufräumen nach packeterstellung unterbinden.
+# 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
+#         kümmern
+
+#Module zur Erstellung des Packetes: lcms2
+#Quelle der Source Archive: www.littlecms.com
+#Kurzbeschreibung:
+#Color Management Tools
+#
+#Letzte Änderung von: $Author$
+#Datum der letzten Änderung: $Date: 2009-05-20 12:04:23 +0200 (Mi, 20 Mai 2009) $
+#Version der Datei: $Rev$
+#
+#
+
+SRCPATH=Tools/Lib
+
+premk() {
+	echo "Nothing to do for premk()"
+}
+
+mk32() {
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=$UARCH \
+	./configure --target=$TARGET32 \
+		    --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	ClearHostSysNameing32 $TMPROOT
+	make distclean
+}
+
+mk() {
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
+	./configure --target=$TARGET \
+		    --libdir=/usr/${LIBDIR} \
+		    --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	ClearHostSysNameing $TMPROOT
+}
+
+postmk() {
+	echo "Nothing to do for postmk()"
+}
diff --git a/SysBuild/tools/libIDL b/SysBuild/tools/libIDL
index ea2d487..88f7082 100644
--- a/SysBuild/tools/libIDL
+++ b/SysBuild/tools/libIDL
@@ -93,14 +93,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
         	    --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
@@ -116,6 +113,9 @@ postmk() {
 	else
 		ln -s libIDL-config-2 $TMPROOT/usr/bin/libIDL-config
 	fi
-	cd $TMPROOT/usr/lib
-	ln -s libIDL-2.so.?.?.? libIDL.so
+	for i in $TMPROOT/usr/lib*; do
+		cd $i
+		ln -s libIDL-2.so.?.?.? libIDL.so
+		cd -
+	done
 }
diff --git a/SysBuild/tools/libart_lgpl b/SysBuild/tools/libart_lgpl
index e6e40ed..9c3f737 100644
--- a/SysBuild/tools/libart_lgpl
+++ b/SysBuild/tools/libart_lgpl
@@ -96,14 +96,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
         	    --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
diff --git a/SysBuild/tools/libatomic-ops b/SysBuild/tools/libatomic-ops
index 95df412..4a8d8e6 100644
--- a/SysBuild/tools/libatomic-ops
+++ b/SysBuild/tools/libatomic-ops
@@ -82,19 +82,20 @@ mk32() {
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
+	GenDynLib32 $TMPROOT/usr/lib/libatomic_ops.a 7.2.0
+	GenDynLib32 $TMPROOT/usr/lib/libatomic_ops_gpl.a 7.2.0
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	GenDynLib $TMPROOT/usr/${LIBDIR}/libatomic_ops.a 7.2.0
+	GenDynLib $TMPROOT/usr/${LIBDIR}/libatomic_ops_gpl.a 7.2.0
 }
 
 postmk() {
diff --git a/SysBuild/tools/libavc1394 b/SysBuild/tools/libavc1394
index 03dfd98..9a57730 100644
--- a/SysBuild/tools/libavc1394
+++ b/SysBuild/tools/libavc1394
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libburn b/SysBuild/tools/libburn
index 9923ec8..567cf33 100644
--- a/SysBuild/tools/libburn
+++ b/SysBuild/tools/libburn
@@ -88,13 +88,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libcdio b/SysBuild/tools/libcdio
index 8d51092..01fb075 100644
--- a/SysBuild/tools/libcdio
+++ b/SysBuild/tools/libcdio
@@ -94,14 +94,11 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libcroco b/SysBuild/tools/libcroco
index fa4d554..46fd137 100644
--- a/SysBuild/tools/libcroco
+++ b/SysBuild/tools/libcroco
@@ -96,14 +96,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
         	    --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
diff --git a/SysBuild/tools/libdaemon b/SysBuild/tools/libdaemon
index d4d478e..799079e 100644
--- a/SysBuild/tools/libdaemon
+++ b/SysBuild/tools/libdaemon
@@ -85,13 +85,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libevent b/SysBuild/tools/libevent
index 56e9bcd..b5a91ca 100644
--- a/SysBuild/tools/libevent
+++ b/SysBuild/tools/libevent
@@ -94,14 +94,11 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --build=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libexif b/SysBuild/tools/libexif
index 8766604..fa0fd58 100644
--- a/SysBuild/tools/libexif
+++ b/SysBuild/tools/libexif
@@ -89,14 +89,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr && 
 	make &&
 	make DESTDIR=$TMPROOT install 
diff --git a/SysBuild/tools/libghttp b/SysBuild/tools/libghttp
index d29cf77..8d86cc2 100644
--- a/SysBuild/tools/libghttp
+++ b/SysBuild/tools/libghttp
@@ -92,24 +92,19 @@ mk32() {
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	CheckError "Make install process failed !" 1
 	make distclean
-	GenDynLib32 $TMPROOT/usr/lib/libghttp.a 1.0.9
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ];then 
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
         	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --with-gnu-ld &&
 	make -j $NUMCPU  &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	CheckError "Make install process failed !" 1
-	GenDynLib $TMPROOT/usr/$LIBDIR/libghttp.a 1.0.9
 }
 
 postmk() {
diff --git a/SysBuild/tools/libiconv b/SysBuild/tools/libiconv
index 5b5ae20..4af6aa7 100644
--- a/SysBuild/tools/libiconv
+++ b/SysBuild/tools/libiconv
@@ -76,12 +76,13 @@ SRCPATH=Tools/Lib
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
 
 premk() {
-	if [ -d /usr/man ]; then
-		mv /usr/man /usr/man.store
-	fi
-	if [ -d /usr/doc ]; then
-		mv /usr/doc /usr/doc.store
-	fi
+	#if [ -d /usr/man ]; then
+		#mv /usr/man /usr/man.store
+	#fi
+	#if [ -d /usr/doc ]; then
+		#mv /usr/doc /usr/doc.store
+	#fi
+	echo "Nothing to do for premk()"
 }
 
 mk32() {
@@ -89,40 +90,25 @@ mk32() {
 	CC="g++ $BUILDOPTIONS32" \
 	./configure --host=$TARGET32 \
 		    --prefix=/usr \
-		    --enable-static && #Optionen eintragen!! 
+		    --enable-static && 
 
 	make -j $NUMCPU &&
-	make -j $NUMCPU install
-	make -j $NUMCPU DESTDIR=$TMPROOT install #Prüfen ob DESTDIR von Makefile unterstützt wird!
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	./configure --host=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
-		    --enable-static && #Optionen eintragen!! 
-
-	make -j $NUMCPU &&
-	make -j $NUMCPU install
-	make -j $NUMCPU DESTDIR=$TMPROOT install #Prüfen ob DESTDIR von Makefile unterstützt wird!
+		    --libdir=/usr/${LIBDIR} \
+		    --enable-static 
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	mkdir -p $TMPROOT/usr/share
-	mv $TMPROOT/usr/man $TMPROOT/usr/share
-	rm -r /usr/man
-	rm -r /usr/doc
-	if [ -d /usr/man.store ]; then
-		mv /usr/man.store /usr/man
-	fi
-	if [ -d /usr/doc.store ]; then
-		mv /usr/doc.store /usr/doc
-	fi
+	echo "Nothing to do for postmk()"
 }
diff --git a/SysBuild/tools/libiec61883 b/SysBuild/tools/libiec61883
index 2ae1ac4..853d9c1 100644
--- a/SysBuild/tools/libiec61883
+++ b/SysBuild/tools/libiec61883
@@ -89,16 +89,13 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 	            --sysconfdir=/etc \
 		    --docdir=/usr/share/doc/libiec \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libisofs b/SysBuild/tools/libisofs
index e769196..a6fb374 100644
--- a/SysBuild/tools/libisofs
+++ b/SysBuild/tools/libisofs
@@ -88,13 +88,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/liboil b/SysBuild/tools/liboil
index 0786bc7..0167de5 100644
--- a/SysBuild/tools/liboil
+++ b/SysBuild/tools/liboil
@@ -82,23 +82,21 @@ mk32() {
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
 	./configure --build=$TARGET32 \
-		    --prefix=/usr
-	for i in Makefile libtool examples/work/Makefile; do
-		sed -i "s/lib64/lib/" $i
-	done
+		    --prefix=/usr \
+		    --libdir=\${prefix}/lib
+	#for i in Makefile libtool examples/work/Makefile; do
+		#sed -i "s/lib64/lib/" $i
+	#done
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libotr b/SysBuild/tools/libotr
index f303a7b..3790ad5 100644
--- a/SysBuild/tools/libotr
+++ b/SysBuild/tools/libotr
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libpng b/SysBuild/tools/libpng
index ebe285a..e164f64 100644
--- a/SysBuild/tools/libpng
+++ b/SysBuild/tools/libpng
@@ -60,7 +60,7 @@
 #         kümmern
 
 #Module zur Erstellung des Packetes:libpng
-#Quelle der Source Archive: ftp://ftp.uu.net/graphics/jpeg
+#Quelle der Source Archive: http://www.libpng.org/pub/png/libpng.html
 #Kurzbeschreibung:
 #Sammlung von Funktionen zur Bearbeitung des png Bildvormates.
 #
@@ -88,7 +88,8 @@ mk32() {
 		    --prefix=/usr
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	mv $TMPROOT/usr/bin/libpng12-config{,-32}
+	mv $TMPROOT/usr/bin/libpng15-config{,-32}
+	cp $TMPROOT/usr/bin/libpng15-config-32 $TMPROOT/usr/bin/libpng-config-32
 	make distclean
 }
 
@@ -101,7 +102,7 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
@@ -111,8 +112,11 @@ mk() {
 #in $TMPROOT noch einiges korrigieren
 postmk() {
 	if [ "$MK64BIT" == "true" ]; then
-		mv $TMPROOT/usr/bin/libpng12-config{,-64}
-		ln -s multiarch_wrapper $TMPROOT/usr/bin/libpng12-config
+		mv $TMPROOT/usr/bin/libpng15-config{,-64}
+		rm $TMPROOT/usr/bin/libpng-config
+		cp $TMPROOT/usr/bin/libpng15-config-64 $TMPROOT/usr/bin/libpng-config-64
+		ln -s multiarch_wrapper $TMPROOT/usr/bin/libpng15-config
+		ln -s multiarch_wrapper $TMPROOT/usr/bin/libpng-config
 	fi
-	ln -s libpng12 $TMPROOT/usr/include/libpng
+	ln -s libpng15 $TMPROOT/usr/include/libpng
 }
diff --git a/SysBuild/tools/libraw1394 b/SysBuild/tools/libraw1394
index 008a4fb..0292ef1 100644
--- a/SysBuild/tools/libraw1394
+++ b/SysBuild/tools/libraw1394
@@ -58,8 +58,8 @@
 # 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
 #         kümmern
 
-#Module zur Erstellung des Packetes: 
-#Quelle der Source Archive: http://www.linux1394.org/
+#Module zur Erstellung des Packetes: libraw1394
+#Quelle der Source Archive: http://sourceforge.net/projects/libraw1394/files/
 #Kurzbeschreibung: Lib für FireWire?
 #
 #
@@ -87,14 +87,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libsigc++ b/SysBuild/tools/libsigc++
index 8473b9e..903a7b9 100644
--- a/SysBuild/tools/libsigc++
+++ b/SysBuild/tools/libsigc++
@@ -62,7 +62,7 @@
 #Module zur Erstellung des Packetes: libsigc++
 #Quelle der Source Archive: ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++
 #Kurzbeschreibung:
-#c++ Addon for gtk
+#Typesafe callback Framework für C++
 #
 #Letzte Änderung von: $Author$
 #Datum der letzten Änderung: $Date: 2009-05-20 12:04:23 +0200 (Mi, 20 Mai 2009) $
@@ -95,15 +95,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
         	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --with-gnu-ld
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/libsmi b/SysBuild/tools/libsmi
index 94898c1..afa080f 100644
--- a/SysBuild/tools/libsmi
+++ b/SysBuild/tools/libsmi
@@ -94,14 +94,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
         	    --prefix=/usr \
 		    --enable-smi \
 		    --enable-sming \
diff --git a/SysBuild/tools/libusb b/SysBuild/tools/libusb
index c015e0f..5c270a4 100644
--- a/SysBuild/tools/libusb
+++ b/SysBuild/tools/libusb
@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/System
+SRCPATH=Tools/Lib
 
 premk() {
 	echo "Nothing to do for premk()"
@@ -83,18 +83,14 @@ mk32() {
 		    --disable-build-docs
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	mv $TMPROOT/usr/bin/libusb-config{,-32}
 	make distclean
 	}
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr \
 		    --disable-build-docs
 	make -j $NUMCPU
@@ -102,8 +98,5 @@ mk() {
 }
 
 postmk() {
-	if [ "$MK64BIT" == "true" ]; then
-		mv $TMPROOT/usr/bin/libusb-config{,-64}
-		ln -s multiarch_wrapper $TMPROOT/usr/bin/libusb-config
-	fi
+	echo "Nothing to do for postmk()"
 }
diff --git a/SysBuild/tools/libxslt b/SysBuild/tools/libxslt
index d2c6f9d..44096ba 100644
--- a/SysBuild/tools/libxslt
+++ b/SysBuild/tools/libxslt
@@ -96,15 +96,12 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --with-gnu-ld  &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/lzo b/SysBuild/tools/lzo
index cea1c36..8dd6f6d 100644
--- a/SysBuild/tools/lzo
+++ b/SysBuild/tools/lzo
@@ -93,15 +93,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARET \
         	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --enable-shared \
 		    --with-gnu-ld &&
 	make -j $NUMCPU  &&
@@ -110,12 +107,5 @@ mk() {
 }
 
 postmk() {
-	cd $TMPROOT/usr/lib
-	ln -s liblzo2.so.2.* liblzo.so
-	cd -
-	if [ "$MK64BIT" == "true" ]; then
-		cd $TMPROOT/usr/lib64
-		ln -s liblzo2.so.2.* liblzo.so
-		cd -
-	fi
+	echo "Nothing to do for postmk()"
 }
diff --git a/SysBuild/tools/bluez-libs b/SysBuild/tools/obexd
similarity index 98%
rename from SysBuild/tools/bluez-libs
rename to SysBuild/tools/obexd
index 440bfe4..71aead6 100644
--- a/SysBuild/tools/bluez-libs
+++ b/SysBuild/tools/obexd
@@ -58,10 +58,10 @@
 # 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
 #         kümmern
 
-#Module zur Erstellung des Packetes: 
+#Module zur Erstellung des Packetes: obexd
 #Quelle der Source Archive: http://www.bluez.org/
 #Kurzbeschreibung:
-#libraries for bluez
+#Obex Connectivity über Bluetooth
 #
 #
 #Letzte Änderung von: $Author$
diff --git a/SysBuild/tools/openexr b/SysBuild/tools/openexr
index db8679c..3b1d6ab 100644
--- a/SysBuild/tools/openexr
+++ b/SysBuild/tools/openexr
@@ -85,13 +85,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/parted b/SysBuild/tools/parted
index 5eac7d8..5d4ece6 100644
--- a/SysBuild/tools/parted
+++ b/SysBuild/tools/parted
@@ -58,13 +58,13 @@
 # 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
 #         kümmern
 
-#Module zur Erstellung des Packetes: 
-#Quelle der Source Archive: 
+#Module zur Erstellung des Packetes: parted
+#Quelle der Source Archive: ftp://ftp.gnu.org/gnu/parted
 #ACHTUNG: Beschreibung nicht in der gleichen Zeile beginnen!
 #Neue Zeile anfangen. sonste funktioniert die metadaten erzeugung
 #nicht!
 #Kurzbeschreibung:
-#
+#Support Library mit Funktionen zur Partitionierung von Festplatten
 #
 #Letzte Änderung von: $Author$
 #Datum der letzten Änderung: $Date: 2009-05-20 12:04:23 +0200 (Mi, 20 Mai 2009) $
@@ -75,30 +75,33 @@
 SRCPATH=Tools/Lib
 
 premk() {
-	echo "Nothing to do for premk()"
+	mkdir ../build-parted
+	cd ../build-parted
 }
 
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
-	./configure --target=$TARGET32 \
+	USE_ARCH=$UARCH \
+	../parted*/configure --target=$TARGET32 \
 		    --prefix=/usr \
 		    --disable-Werror \
 		    --without-readline \
 		    --enable-device-mapper
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	make clean
+	cd ../parted*
+	rm -r ../build-parted
+	mkdir ../build-parted
+	cd ../build-parted
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+	USE_ARCH=$UARCH \
+	../parted*/configure --target=$TARGET \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --disable-Werror \
 		    --without-readline \
@@ -108,5 +111,6 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	cd ../parted*
+	rm -r ../build-parted
 }
diff --git a/SysBuild/tools/pcre b/SysBuild/tools/pcre
index 215040f..c4a132a 100644
--- a/SysBuild/tools/pcre
+++ b/SysBuild/tools/pcre
@@ -91,14 +91,11 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr && 
 	make &&
 	make DESTDIR=$TMPROOT install