diff --git a/SysBuild/BuildCluster/XBaseLibs.dmk b/SysBuild/BuildCluster/XBaseLibs.dmk
index 98ed2f6..da39e5f 100644
--- a/SysBuild/BuildCluster/XBaseLibs.dmk
+++ b/SysBuild/BuildCluster/XBaseLibs.dmk
@@ -40,7 +40,6 @@
 6	tools/udev
 0	tools/DeviceKit-disks
 0	tools/upower
-
 0	guibased/libnotify
 0	guibased/libsexy
 0	guibased/lesstif
diff --git a/SysBuild/dbase/postgresql b/SysBuild/dbase/postgresql
index 6a60c0a..bcf2a20 100644
--- a/SysBuild/dbase/postgresql
+++ b/SysBuild/dbase/postgresql
@@ -76,7 +76,6 @@ SRCPATH=DBase/Server
 
 
 premk() {
-	#X11R7_Fix
 	echo "Nothing to do for premk()"
 }
 
@@ -109,24 +108,18 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-		LIBDIRS="lib64"
-	else
-		LIBDIRS="lib"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
         	    --prefix=/opt/PostgreSQL \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --enable-locale \
 		    --enable-multibyte \
 		    --enable-unicode-conversion \
 		    --with-tcl \
-		    --with-tclconfig=/usr/X11R7/$LIBDIRS/ \
-		    --with-tkconfig=/usr/X11R7/$LIBDIRS/ \
+		    --with-tclconfig=/usr/X11R7/${LIBDIR}/ \
+		    --with-tkconfig=/usr/X11R7/${LIBDIR}/ \
 		    --with-pam \
 		    --with-python \
 		    --with-openssl \
diff --git a/SysBuild/dbase/unixODBC b/SysBuild/dbase/unixODBC
index aa9cd67..6715826 100644
--- a/SysBuild/dbase/unixODBC
+++ b/SysBuild/dbase/unixODBC
@@ -102,26 +102,23 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	LDFLAGS="-L/opt/qt-4/$LIBDIR" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
         	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    $GUIOPTIONS \
 		    --enable-threads \
 		    --enable-driver \
 		    --with-gnu-ld  \
 		    --sysconfdir=/etc/sysconfig/unixODBC 
-	if [ "$MK64BIT" == "true" ]; then
-		sed -i -e "s/\/lib /\/lib64 /g" libtool 
-		sed -i -e "s/\/lib\"/\/lib64\"/g" libtool
-		sed -i -e "s/\/lib\//\/lib64\//g" libtool
-	fi
+	#if [ "$MK64BIT" == "true" ]; then
+		#sed -i -e "s/\/lib /\/lib64 /g" libtool 
+		#sed -i -e "s/\/lib\"/\/lib64\"/g" libtool
+		#sed -i -e "s/\/lib\//\/lib64\//g" libtool
+	#fi
 	make -j $NUMCPU &&
 	make -j $NUMCPU install &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/guibased/efltk b/SysBuild/guibased/efltk
index 7680a46..dd5740e 100644
--- a/SysBuild/guibased/efltk
+++ b/SysBuild/guibased/efltk
@@ -72,13 +72,15 @@
 SRCPATH=GuiBased/Lib
 
 premk() {
-	mkdir -p $TMPROOT/usr/X11R7/lib
+	echo "Nothing to do for premk()"
 }
 
 mk32() {
+	mkdir -p $TMPROOT/usr/X11R7/lib
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
 	LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
+	USE_ARCH=$UARCH \
 	./configure --target=$TARGET32 \
 		    --prefix=/usr/X11R7 \
 		    --enable-xdbe \
@@ -86,29 +88,28 @@ mk32() {
 		    --enable-opengl \
 		    --enable-plugins \
 		    --with-x
-	make -j $NUMCPU
-	make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
-	make distclean
+	./emake -j $NUMCPU
+	./emake -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
+	./emake distclean
 	mv $TMPROOT/usr/X11R7/bin/efltk-config{,-32}
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-		mkdir -p $TMPROOT/usr/X11R7/lib64
-	fi
+	mkdir -p $TMPROOT/usr/X11R7/${LIBDIR}
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \
+	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr/X11R7 \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --enable-xdbe \
 		    --enable-enable-xft \
 		    --enable-opengl \
 		    --enable-plugins \
 		    --with-x
-	make -j $NUMCPU
-	make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
+	./emake -j $NUMCPU
+	./emake -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
 }
 
 postmk() {
diff --git a/SysBuild/guibased/fontforge b/SysBuild/guibased/fontforge
index 26e243f..2cc270b 100644
--- a/SysBuild/guibased/fontforge
+++ b/SysBuild/guibased/fontforge
@@ -80,7 +80,7 @@ mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=$UARCH \
-	LDFLAGS="-L/usr/X11R7/lib" \
+	LDFLAGS="-L/usr/X11R7/lib -liconv" \
 	./configure --target=$TARGET32 \
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
@@ -89,15 +89,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	LDFLAGS="-L/usr/X11R7/lib64" \
+	LDFLAGS="-L/usr/X11R7/${LIBDIR} -liconv" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
diff --git a/SysBuild/guibased/lesstif b/SysBuild/guibased/lesstif
index fb4410c..b575a9d 100644
--- a/SysBuild/guibased/lesstif
+++ b/SysBuild/guibased/lesstif
@@ -75,7 +75,6 @@ SRCPATH=GuiBased/Lib
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
 
 premk() {
-	#X11R7_Fix
 	echo "Nothing to do for premk()"
 }
 
@@ -102,15 +101,11 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/X11R7/lib64"
-		mv $TMPROOT/usr/X11R7/lib $TMPROOT/usr/X11R7/lib32
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
 		    --prefix=/usr/X11R7 \
-		    $ADDOPTIONS \
+		    --libdir=/usr/X11R7/${LIBDIR} \
 	            --enable-build-12 \
 	            --enable-build-20 \
 	            --enable-build-21 \
@@ -135,10 +130,8 @@ mk() {
 		tar -cf - .|tar -C ../lib64 -xf -
 		cd -
 		rm -r $TMPROOT/usr/X11R7/lib
-		mv $TMPROOT/usr/X11R7/lib32 $TMPROOT/usr/X11R7/lib
 		rm -r $TMPROOT/usr/X11R7/lib/X11
-		sed -e "s%/lib %/lib64 %g" $TMPROOT/usr/X11R7/bin/motif-config >/tmp/motif-config
-		mv /tmp/motif-config $TMPROOT/usr/X11R7/bin/motif-config
+		sed -e "s%/lib %/lib64 %g" $TMPROOT/usr/X11R7/bin/motif-config
 		chmod 755 $TMPROOT/usr/X11R7/bin/motif-config
 	fi
 }
diff --git a/SysBuild/guibased/libglade b/SysBuild/guibased/libglade
index f736f07..ac354f5 100644
--- a/SysBuild/guibased/libglade
+++ b/SysBuild/guibased/libglade
@@ -93,14 +93,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/X11R7 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
diff --git a/SysBuild/guibased/libgphoto2 b/SysBuild/guibased/libgphoto2
index c109471..8b8576e 100644
--- a/SysBuild/guibased/libgphoto2
+++ b/SysBuild/guibased/libgphoto2
@@ -87,13 +87,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -L/usr/$LIBIDR -L/usr/X11R7/$LIBDIR" \
 	CXX="g++ $BUILDOPTIONS -L/usr/$LIBIDR -L/usr/X11R7/$LIBDIR" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/guibased/libgsf b/SysBuild/guibased/libgsf
index 74206a3..b916646 100644
--- a/SysBuild/guibased/libgsf
+++ b/SysBuild/guibased/libgsf
@@ -94,14 +94,11 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
         	    --prefix=/usr/X11R7 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
diff --git a/SysBuild/guibased/libiptcdata b/SysBuild/guibased/libiptcdata
index ec8024a..94b76ff 100644
--- a/SysBuild/guibased/libiptcdata
+++ b/SysBuild/guibased/libiptcdata
@@ -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/guibased/librsvg b/SysBuild/guibased/librsvg
index bcc8405..7955640 100644
--- a/SysBuild/guibased/librsvg
+++ b/SysBuild/guibased/librsvg
@@ -94,14 +94,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/X11R7 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
diff --git a/SysBuild/guibased/libsexy b/SysBuild/guibased/libsexy
index 5441c21..6dfb68e 100644
--- a/SysBuild/guibased/libsexy
+++ b/SysBuild/guibased/libsexy
@@ -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/guibased/libwnck b/SysBuild/guibased/libwnck
index fcbd82e..575a877 100644
--- a/SysBuild/guibased/libwnck
+++ b/SysBuild/guibased/libwnck
@@ -85,7 +85,8 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=$UARCH \
 	../libwnck*/configure --target=$TARGET32 \
-        	    --prefix=/usr/X11R7 &&
+			      --prefix=/usr/X11R7 \
+			      --enable-introspection=no
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
@@ -96,15 +97,13 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	../libwnck*/configure --target=$TARGET \
-		    $ADDOPTIONS \
-        	    --prefix=/usr/X11R7 &&
+			      --libdir=\${prefix}/${LIBDIR} \
+			      --prefix=/usr/X11R7 \
+			      --enable-introspection=no
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
diff --git a/SysBuild/guibased/libxklavier b/SysBuild/guibased/libxklavier
index 8dfc328..5d8ab78 100644
--- a/SysBuild/guibased/libxklavier
+++ b/SysBuild/guibased/libxklavier
@@ -96,14 +96,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ];then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
         	    --prefix=/usr/X11R7 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU install &&
diff --git a/SysBuild/guibased/libxmi b/SysBuild/guibased/libxmi
index 6495d34..02cd237 100644
--- a/SysBuild/guibased/libxmi
+++ b/SysBuild/guibased/libxmi
@@ -89,23 +89,18 @@ mk32() {
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
-	GenDynLib32 $TMPROOT/usr/X11R7/lib/libxmi.a 1.2.0
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/X11R7/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/X11R7/${LIBDIR} \
 		    --prefix=/usr/X11R7 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libxmi.a 1.2.0
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
diff --git a/SysBuild/guibased/opal b/SysBuild/guibased/opal
index 6c9121c..24a3a69 100644
--- a/SysBuild/guibased/opal
+++ b/SysBuild/guibased/opal
@@ -72,43 +72,42 @@
 SRCPATH=GuiBased/Lib
 
 premk() {
-	sed -i -e "s:share/pwlib:lib/pwlib:g" configure
+	echo "Nothing to do for premk()"
 }
 
 mk32() {
 	CC="gcc ${BUILDOPTIONS32}" \
 	CXX="g++ ${BUILDOPTIONS32}" \
-	LDFLAGS="-L/usr/lib" 
+	LDFLAGS="-L/usr/lib"  \
 	USE_ARCH=$UARCH \
-	./configure --build=$TARGET32 \
+	../opal-*/configure --build=$TARGET32 \
 		    --with-bluez=/usr \
-		    --prefix=/usr
-	STTARGET=$TARGET
-	unset TARGET
+		    --prefix=/usr \
+		    --disable-java \
+		    --disable-celt
 	make -j $NUMCPU CC="gcc $BUILDOPTIONS32" \
 			CXX="g++ $BUILDOPTIONS32" \
 			LDFLAGS="-L/usr/lib" \
 			USE_ARCH=$UARCH 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	make clean
-	export TARGET=$STTARGET
-	unset STTARGET
+	cd ..
+	rm -r opal-*
+	UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/opal-*.tar.bz2
+	cd $MAKEDIR/opal-*
 }
 
 mk() {
-	sed -i -e "s:lib/pwlib:$LIBDIR/pwlib:g" configure
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${PREFIX}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/qt-4/$LIBDIR" \
-	./configure --build=$TARGET \
+	../opal-*/configure --build=$TARGET \
 		    --enable-apps \
 		    --with-bluez=/usr \
-		    $ADDOPTIONS \
-		    --prefix=/usr
+		    --libdir=\${prefix}/${LIBDIR} \
+		    --prefix=/usr \
+		    --disable-java \
+		    --disable-celt
 	make -j $NUMCPU CC="gcc $BUILDOPTIONS" CXX="g++ $BUILDOPTIONS" 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
diff --git a/SysBuild/guibased/qt-everywhere-opensource-src b/SysBuild/guibased/qt-everywhere-opensource-src
index effa7f6..aa75830 100644
--- a/SysBuild/guibased/qt-everywhere-opensource-src
+++ b/SysBuild/guibased/qt-everywhere-opensource-src
@@ -89,8 +89,9 @@ mk32() {
 	export QMAKESPEC=linux-g++-32 &&
 	echo -e "o\nyes" |
 	USE_ARCH=$UARCH \
+	LDFLAGS="-m32 -liconv" \
 	../qt-*/configure -prefix /opt/qt-4 \
-			  -libdir /opt/qt-4/lib
+			  -libdir /opt/qt-4/lib \
 			  -plugindir /opt/qt-4/lib/plugins \
 			  -headerdir /opt/qt-4/include \
 			  -datadir /opt/qt-4/share \
@@ -152,6 +153,7 @@ mk() {
 	fi
 	echo -e "o\nyes" |
 	USE_ARCH=$UARCH \
+	LDFLAGS="-liconv" \
 	../qt-*/configure -prefix /opt/qt-4 \
 			  -libdir /opt/qt-4/$LIBDIR \
 			  -plugindir /opt/qt-4/$LIBDIR/plugins \
diff --git a/SysBuild/guibased/wxGTK b/SysBuild/guibased/wxGTK
index 70e199e..21839da 100644
--- a/SysBuild/guibased/wxGTK
+++ b/SysBuild/guibased/wxGTK
@@ -103,15 +103,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/X11R7 \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --with-sdl \
 		    --enable-compat24 \
 		    --enable-threads \
diff --git a/SysBuild/multimedia/faac b/SysBuild/multimedia/faac
index 42c7ff8..c5c977d 100644
--- a/SysBuild/multimedia/faac
+++ b/SysBuild/multimedia/faac
@@ -90,13 +90,10 @@ mk32() {
 }
 
 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 \
 		    --sysconfdir=/etc \
 		    --with-mp4v2
diff --git a/SysBuild/multimedia/faad2 b/SysBuild/multimedia/faad2
index cc345a6..a7d9786 100644
--- a/SysBuild/multimedia/faad2
+++ b/SysBuild/multimedia/faad2
@@ -91,13 +91,10 @@ mk32() {
 }
 
 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 \
 		    --sysconfdir=/etc \
 		    --with-drm \
diff --git a/SysBuild/multimedia/ffmpeg b/SysBuild/multimedia/ffmpeg
index a95e06a..e223f0a 100644
--- a/SysBuild/multimedia/ffmpeg
+++ b/SysBuild/multimedia/ffmpeg
@@ -98,8 +98,7 @@ mk32() {
 		    --enable-x11grab \
 		    --enable-nonfree \
 		    --enable-swscale \
-		    --enable-libfaac \
-		    --enable-libfaad
+		    --enable-libfaac 
 	make -j $NUMCPU
 	make -j $NUMCPU PREFIX=/usr/X11R7 DESTDIR=$TMPROOT install
 	make distclean
@@ -127,8 +126,7 @@ mk() {
 		    --enable-x11grab \
 		    --enable-nonfree \
 		    --enable-swscale \
-		    --enable-libfaac \
-		    --enable-libfaad 
+		    --enable-libfaac 
 	make -j $NUMCPU libdir=\${DESTDIR}\${PREFIX}/$LIBDIR \
 	                shlibdir=\${DESTDIR}\${PREFIX}/$LIBDIR \
 			PREFIX=/usr/X11R7 
diff --git a/SysBuild/multimedia/ffmpegthumbnailer b/SysBuild/multimedia/ffmpegthumbnailer
index 419f5b7..e3f8fa2 100644
--- a/SysBuild/multimedia/ffmpegthumbnailer
+++ b/SysBuild/multimedia/ffmpegthumbnailer
@@ -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/libcanberra b/SysBuild/multimedia/libcanberra
index d2ff94b..8146c50 100644
--- a/SysBuild/multimedia/libcanberra
+++ b/SysBuild/multimedia/libcanberra
@@ -83,21 +83,18 @@ mk32() {
 	USE_ARCH=32 \
 	./configure --prefix=/usr
 	make -j $NUMCPU
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make 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
+	make DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/SysBuild/multimedia/v4l-utils b/SysBuild/multimedia/v4l-utils
index 98b79cb..c9d0481 100644
--- a/SysBuild/multimedia/v4l-utils
+++ b/SysBuild/multimedia/v4l-utils
@@ -80,7 +80,10 @@ mk32() {
 	     USE_ARCH=32 \
 	     -j $NUMCPU
 	make -j $NUMCPU PREFIX=$TMPROOT/usr install
-	make clean
+	cd ..
+	rm -r v4l-utils*
+	UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/v4l-utils-*.tar.bz2
+	cd $MAKEDIR/v4l-utils*
 }
 
 mk() {
@@ -88,8 +91,11 @@ mk() {
 	     CXX="g++ $BUILDOPTIONS" \
 	     USE_ARCH=$UARCH \
 	     -j $NUMCPU
-	make -j $NUMCPU PREFIX=$TMPROOT/usr \
+	make -j $NUMCPU CC="gcc $BUILDOPTIONS" \
+			CXX="g++ $BUILDOPTIONS" \
+			PREFIX=$TMPROOT/usr \
 	                LIBDIR=$TMPROOT/usr/$LIBDIR \
+			USE_ARCH=$UARCH \
 			install
 }
 
diff --git a/SysBuild/multimedia/xine-lib b/SysBuild/multimedia/xine-lib
index 29b9ad8..9a68a1e 100644
--- a/SysBuild/multimedia/xine-lib
+++ b/SysBuild/multimedia/xine-lib
@@ -88,32 +88,32 @@ mk32() {
 	            --build=$TARGET32 \
 		    --host=$TARGET32 \
 		    --prefix=/usr/X11R7 \
-		    --without-imagemagick \
 		    --with-gnu-ld \
 		    --enable-modplug \
 		    --with-external-ffmpeg \
+		    --disable-xvmc \
 		    --with-w32-path=/usr/lib/win32
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
+		    #--without-imagemagick \
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
+	LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \
 	./configure --prefix=/usr/X11R7 \
-		    $ADDOPTIONS \
-		    --without-imagemagick \
+		    --libdir=/usr/X11R7/${LIBDIR} \
 		    --with-gnu-ld \
 		    --enable-modplug \
 		    --with-external-ffmpeg \
+		    --disable-xvmc \
 		    --with-w32-path=/usr/lib/win32
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+		    #--without-imagemagick \
 }
 
 postmk() {
diff --git a/SysBuild/network/apr-util b/SysBuild/network/apr-util
index fa31995..4628187 100644
--- a/SysBuild/network/apr-util
+++ b/SysBuild/network/apr-util
@@ -83,21 +83,28 @@ mk32() {
 	./configure --target=$TARGET32 \
 		    --prefix=/usr \
 		    --with-apr=/usr
-	make -j $NUMCPU CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32" USE_ARCH=32 LDEMULATION=elf32_i386 LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" 
-	make -j $NUMCPU DESTDIR=$TMPROOT CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32" USE_ARCH=32 LDEMULATION=elf32_i386 install LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib"
+	make -j $NUMCPU CC="gcc $BUILDOPTIONS32" \
+	                CXX="g++ $BUILDOPTIONS32" \
+			USE_ARCH=32 \
+			LDEMULATION=elf32_i386 \
+			LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" 
+	make -j $NUMCPU DESTDIR=$TMPROOT \
+	                CC="gcc $BUILDOPTIONS32" \
+			CXX="g++ $BUILDOPTIONS32" \
+			USE_ARCH=32 \
+			LDEMULATION=elf32_i386 \
+			LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
+			install 
 	make distclean
 	mv $TMPROOT/usr/bin/apu-1-config{,-32}
 }
 
 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 \
 		    --with-apr=/usr
 	make -j $NUMCPU
diff --git a/SysBuild/security/libtasn1 b/SysBuild/security/libtasn1
index a6662f4..baad8ce 100644
--- a/SysBuild/security/libtasn1
+++ b/SysBuild/security/libtasn1
@@ -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/security/qca b/SysBuild/security/qca
index f88c595..e86650b 100644
--- a/SysBuild/security/qca
+++ b/SysBuild/security/qca
@@ -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 INSTALL_ROOT=$TMPROOT install
diff --git a/SysBuild/tools/libgtop b/SysBuild/tools/libgtop
index 720a67d..e2cc9a9 100644
--- a/SysBuild/tools/libgtop
+++ b/SysBuild/tools/libgtop
@@ -90,7 +90,8 @@ mk32() {
 		    --prefix=/usr/X11R7 \
 		    --libexecdir=/usr/X11R7/bin \
 		    --with-linux-table \
-		    --with-x &&
+		    --with-x  \ 
+		    --enable-introspection=no
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
@@ -98,15 +99,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ];then 
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CC="gcc $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr/X11R7 \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --libexecdir=/usr/X11R7/bin \
 		    --with-linux-table \
 		    --with-x &&
diff --git a/SysBuild/tools/plib b/SysBuild/tools/plib
index 7656cbb..bf24fa0 100644
--- a/SysBuild/tools/plib
+++ b/SysBuild/tools/plib
@@ -113,14 +113,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64 \
-			   --x-libraries=/usr/X11R7/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC -I/usr/X11R7/include" \
 	CXX="g++ $BUILDOPTIONS -fPIC -I/usr/X11R7/include" \
+	LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
+		    --x-libraries=/usr/X11R7/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/tools/plotutils b/SysBuild/tools/plotutils
index 0dde201..f682923 100644
--- a/SysBuild/tools/plotutils
+++ b/SysBuild/tools/plotutils
@@ -96,17 +96,14 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/X11R7/lib64 \
-		           --x-libraries=/usr/X11R7/lib64"
-		LDFLAGS="-L/usr/X11R7/lib64"
-	fi
+	LDFLAGS="-L/usr/X11R7/${LIBDIR}"
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
 	            --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/X11R7/${LIBDIR} \
+		    --x-libraries=/usr/X11R7/${LIBDIR} \
 		    --prefix=/usr/X11R7 \
             	    --enable-libxmi \
 	    	    --includedir=/usr/X11R7/include  &&
diff --git a/SysBuild/tools/wv b/SysBuild/tools/wv
index b6408f0..fb937d9 100644
--- a/SysBuild/tools/wv
+++ b/SysBuild/tools/wv
@@ -88,13 +88,10 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	USE_ARCH=$UARC \
-	./configure $ADDOPTIONS \
+	USE_ARCH=$UARCH \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install