diff --git a/SysBuild/kde/kdeaccessibility b/SysBuild/kde/kdeaccessibility
index 2989133..f415bc9 100644
--- a/SysBuild/kde/kdeaccessibility
+++ b/SysBuild/kde/kdeaccessibility
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -130,6 +133,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdeadmin b/SysBuild/kde/kdeadmin
index eeb1b47..503ac82 100644
--- a/SysBuild/kde/kdeadmin
+++ b/SysBuild/kde/kdeadmin
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -132,6 +135,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	sed -i "s%$%-L/usr/$LIBDIR/sasl2 -lgssapiv2 -lgssapi_krb5%" kuser/CMakeFiles/kuser.dir/link.txt
diff --git a/SysBuild/kde/kdebase-runtime b/SysBuild/kde/kdebase-runtime
index 0b5c0d4..0711190 100644
--- a/SysBuild/kde/kdebase-runtime
+++ b/SysBuild/kde/kdebase-runtime
@@ -80,22 +80,26 @@ premk() {
 mk32() {
 	mkdir -v build &&
 	cd build &&
+	QMAKESPEC=linux-g++-32 \
 	USE_ARCH=32 \
+	CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \
+	CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \
+	LDEMULATION="elf32_i386" \
 	cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
 	      -DSYSCONF_INSTALL_DIR=/etc/kde \
 	      -DLIB_INSTALL_DIR=${KDEDIR}/lib \
 	      -DCMAKE_BUILD_TYPE=Release \
 	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32} -L/opt/kde/lib -L/lib -L/usr/lib -L/usr/X11R7/lib" \
 	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32} -L/opt/kde/lib -L/lib -L/usr/lib -L/usr/X11R7/lib" \
-	      -DX11_LIBRARY=/usr/X11R7/lib \
-	      -DXEXT_LIBRARY=/usr/X11R7/lib \
 	      -DSAMBA_INCLUDE_DIR=/opt/samba/include \
 	      -DSAMBA_LIBRARIES=/opt/samba/lib/libsmbclient.so \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
 	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
 	make -j $NUMCPU depend
-	make -j $NUMCPU QMAKESPEC=linux-g++-32
+	find . -name "link.txt" -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU
 	make DESTDIR=$TMPROOT install
 	cd ..
 	rm -r build
@@ -117,8 +121,6 @@ mk() {
 	      -DCMAKE_BUILD_TYPE=Release \
 	      -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
 	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
-	      -DX11_LIBRARY=/usr/X11R7/$LIBDIR \
-	      -DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DSAMBA_INCLUDE_DIR=/opt/samba/include \
 	      -DSAMBA_LIBRARIES=/opt/samba/$LIBDIR/libsmbclient.so \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
diff --git a/SysBuild/kde/kdeedu b/SysBuild/kde/kdeedu
index 7ef2b8b..cbf8bd9 100644
--- a/SysBuild/kde/kdeedu
+++ b/SysBuild/kde/kdeedu
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -132,6 +135,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	sed -i "s/$/-L \/usr\/X11R7\/$LIBDIR -lGLU/" kalgebra/src/CMakeFiles/kalgebra.dir/link.txt
diff --git a/SysBuild/kde/kdegames b/SysBuild/kde/kdegames
index b3073a9..fa597bf 100644
--- a/SysBuild/kde/kdegames
+++ b/SysBuild/kde/kdegames
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -136,6 +139,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	for i in ksudoku/src/CMakeFiles/ksudoku.dir/link.txt \
diff --git a/SysBuild/kde/kdegraphics b/SysBuild/kde/kdegraphics
index 2989133..f415bc9 100644
--- a/SysBuild/kde/kdegraphics
+++ b/SysBuild/kde/kdegraphics
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -130,6 +133,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdemultimedia b/SysBuild/kde/kdemultimedia
index 2989133..f415bc9 100644
--- a/SysBuild/kde/kdemultimedia
+++ b/SysBuild/kde/kdemultimedia
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -130,6 +133,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdenetwork b/SysBuild/kde/kdenetwork
index 2469491..2565092 100644
--- a/SysBuild/kde/kdenetwork
+++ b/SysBuild/kde/kdenetwork
@@ -102,8 +102,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -143,6 +146,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdepim b/SysBuild/kde/kdepim
index b9b3be0..43399b2 100644
--- a/SysBuild/kde/kdepim
+++ b/SysBuild/kde/kdepim
@@ -102,8 +102,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -141,6 +144,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdeplasma-addons b/SysBuild/kde/kdeplasma-addons
index 736ef6d..6c1bd6a 100644
--- a/SysBuild/kde/kdeplasma-addons
+++ b/SysBuild/kde/kdeplasma-addons
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -130,6 +133,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdetoys b/SysBuild/kde/kdetoys
index 2989133..bcc384f 100644
--- a/SysBuild/kde/kdetoys
+++ b/SysBuild/kde/kdetoys
@@ -77,37 +77,6 @@ premk() {
 	echo "Nothing do do for premk()"
 }
 
-mk32() {
-	mkdir -v build &&
-	cd build &&
-	USE_ARCH=32 \
-	CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \
-	CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \
-	LDEMULATION="elf32_i386" \
-	cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
-	      -DSYSCONF_INSTALL_DIR=/etc/kde \
-	      -DLIB_INSTALL_DIR=${KDEDIR}/lib \
-	      -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \
-	      -DX11_LIBRARY=/usr/X11R7/lib \
-	      -DXEXT_LIBRARY=/usr/X11R7/lib \
-	      -DOPENGL_INCLUDE_DIR=/usr/include/GL \
-	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
-	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
-	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
-	      -DLIB_SUFFIX= \
-	      .. &&
-	for i in build.make link.txt relink.txt; do
-		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
-	done
-	make -j $NUMCPU QMAKESPEC=linux-g++-32
-	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
-	make DESTDIR=$TMPROOT install
-	cd ..
-	rm -r build
-}
-
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
@@ -130,6 +99,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
diff --git a/SysBuild/kde/kdeutils b/SysBuild/kde/kdeutils
index 2989133..f415bc9 100644
--- a/SysBuild/kde/kdeutils
+++ b/SysBuild/kde/kdeutils
@@ -96,8 +96,11 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
@@ -130,6 +133,7 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU