diff --git a/SysBuild/guibased/babl b/SysBuild/guibased/babl
index 2d3964c..0e7d3ba 100644
--- a/SysBuild/guibased/babl
+++ b/SysBuild/guibased/babl
@@ -82,6 +82,7 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=32 \
 	./configure --build=$TARGET32 \
+		    --enable-introspection=no \
 	            --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU install
@@ -90,13 +91,11 @@ 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} \
+		    --enable-introspection=no \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU install
diff --git a/SysBuild/guibased/gegl b/SysBuild/guibased/gegl
index 5019b9b..b5f0d13 100644
--- a/SysBuild/guibased/gegl
+++ b/SysBuild/guibased/gegl
@@ -74,11 +74,11 @@
 SRCPATH=GuiBased/Lib
 
 premk() {
-	echo "Nothing to do for premk()"
+	dot -c
 }
 
 mk32() {
-	USE_ARCH=32 pango-querymodules >/usr/X11R7/etc/pango-32/pango.modules
+	USE_ARCH=32 pango-querymodules >/etc/pango-32/pango.modules
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=32 \
@@ -91,15 +91,14 @@ mk32() {
 
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-		USE_ARCH=$UARCH pango-querymodules >/usr/X11R7/etc/pango-$UARCH/pango.modules
+		USE_ARCH=$UARCH pango-querymodules >/etc/pango-$UARCH/pango.modules
 	else
-		pango-querymodules >/usr/X11R7/etc/pango/pango.modules
+		pango-querymodules >/etc/pango/pango.modules
 	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/gimp b/SysBuild/guibased/gimp
index 2d646fe..676f963 100644
--- a/SysBuild/guibased/gimp
+++ b/SysBuild/guibased/gimp
@@ -84,7 +84,7 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=32 \
 	./configure --prefix=/usr/X11R7 \
-	            --sysconfdir=/etc/sysconfig \
+	            --sysconfdir=/etc \
 		    --datadir=/usr/share \
 		    --build=$TARGET32
 	make -j $NUMCPU
@@ -94,15 +94,12 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --prefix=/usr/X11R7 \
-	            --sysconfdir=/etc/sysconfig \
-		    $ADDOPTIONS \
+	            --sysconfdir=/etc \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --datadir=/usr/share 
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/guibased/gparted b/SysBuild/guibased/gparted
index 1e88f46..933e3ee 100644
--- a/SysBuild/guibased/gparted
+++ b/SysBuild/guibased/gparted
@@ -80,13 +80,10 @@ premk() {
 }
 
 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/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/SysBuild/multimedia/amarok b/SysBuild/multimedia/amarok
index b0d3034..0c5a0c3 100644
--- a/SysBuild/multimedia/amarok
+++ b/SysBuild/multimedia/amarok
@@ -96,7 +96,7 @@ mk() {
 	      -DX11_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DMYSQL_INCLUDE_DIR=/opt/MySQL/include/mysql \
-	      -DMYSQL_LIBRARIES=/opt/MySQL/$LIBDIR/mysql/libmysqlclient.so \
+	      -DMYSQL_LIBRARIES=/opt/MySQL/$LIBDIR/libmysqlclient.so \
 	      -DOPENGL_INCLUDE_DIR=/usr/include/GL \
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
diff --git a/SysBuild/multimedia/mplayer-export b/SysBuild/multimedia/mplayer-export
index 054ab57..3801b57 100644
--- a/SysBuild/multimedia/mplayer-export
+++ b/SysBuild/multimedia/mplayer-export
@@ -87,7 +87,7 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \
 	./configure --prefix=/usr/X11R7 \
-		    $ADDOPTIONS \
+		    --libdir=/usr/X11R7/${LIBDIR} \
 		    --confdir=/etc/sysconfig/mplayer \
 		    --enable-radio \
 		    --enable-radio-capture \
@@ -97,11 +97,8 @@ mk() {
 		    --with-vidix-drivers=cyberblade,ivtv,mach64,mga,mga_crtc2,nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome \
 		    --enable-gl \
 		    --enable-runtime-cpudetection 
-	#if [ "$MK64BIT" == "true" ]; then
-		#sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\164\2 -lfribidi/" config.mak
-	#else
-		#sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\1\2 -lfribidi/" config.mak
-	#fi
+	sed -i "s/\(EXTRALIBS *=.*$\)/\1 -lfribidi/" config.mak
+	sed -i "s/\(EXTRALIBS_MPLAYER.*$\)/\1 -lfribidi/" config.mak
 	make -j $NUMCPU 
 	make CFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \
 	     DESTDIR=$TMPROOT install