diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk
index 0dd371c..f3a4e1d 100644
--- a/SysBuild/BuildCluster/Apps.dmk
+++ b/SysBuild/BuildCluster/Apps.dmk
@@ -21,3 +21,4 @@
 0	tools/foomatic-filters
 0	tools/foomatic-db-engine
 0	tools/foomatic-db
+0	guibased/xv
diff --git a/SysBuild/xsys/xv b/SysBuild/guibased/xv
similarity index 89%
rename from SysBuild/xsys/xv
rename to SysBuild/guibased/xv
index b6f004d..f2ed17e 100644
--- a/SysBuild/xsys/xv
+++ b/SysBuild/guibased/xv
@@ -68,7 +68,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=X11/Grafik
+SRCPATH=GuiBased/Apps
 
 (( MKPKG = $MKPKG | 128 ))
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
@@ -76,26 +76,24 @@ SRCPATH=X11/Grafik
 
 
 premk() {
-	X11R7_Fix
 	mkdir -p $TMPROOT/usr/X11R7/bin
-	tar -zxvf $LFSSOURCE/$SRCPATH/xv-3.10a-jumbo-patches-*.tar.gz
+	tar -C ../ -xvf $LFSSOURCE/$SRCPATH/xv-3.10a-jumbo-patches-*.tar.gz
 	for i in $LFSSOURCE/$SRCPATH/xv-*patch.gz; do
 		gzip -d -c $i|patch
 	done
+	find . -type f -exec sed -i "s/X11R6/X11R7/g" {} \;
 }
 
 mk() {
 	xmkmf
-	sed -e "/^JPEGDIR/d" Makefile |\
-	sed -e "s%^LIBJPEG.*$%LIBJPEG = /usr/$LIBDIR/libjpeg.so%" |\
-	sed -e "s%^JPEGINC.*$%JPEGINC = -I/usr/include%" |\
-	sed -e "/^TIFFDIR/d" |\
-	sed -e "s%^LIBTIFF.*$%LIBTIFF = /usr/$LIBDIR/libtiff.a%" |\
-	sed -e "s%-lm%-lm -lz%" |\
-	sed -e "s%^TIFFINCLUDE.*$%TIFFINCLUDE = -I/usr/include%" >Makefile~
-	mv Makefile~ Makefile
-	sed -e "/extern char \*sys_errlist/d" xv.h >xv.h~
-	mv xv.h~ xv.h
+	sed -i "/^JPEGDIR/d" Makefile
+	sed -i "s%^LIBJPEG.*$%LIBJPEG = /usr/$LIBDIR/libjpeg6b.so%" Makefile
+	sed -i "s%^JPEGINC.*$%JPEGINC = -I/usr/include%" Makefile
+	sed -i "/^TIFFDIR/d" Makefile
+	sed -i "s%^LIBTIFF.*$%LIBTIFF = /usr/$LIBDIR/libtiff.a%" Makefile
+	sed -i "s%-lm%-lm -lz%" Makefile
+	sed -i "s%^TIFFINCLUDE.*$%TIFFINCLUDE = -I/usr/include%" Makefile
+	sed -i "/extern char \*sys_errlist/d" xv.h 
 	make CC="gcc $BUILDOPTIONS" \
 	     CXX="g++ $BUILDOPTIONS" \
 	     LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \