diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk
index 5010561..e3778bb 100644
--- a/SysBuild/BuildCluster/Apps.dmk
+++ b/SysBuild/BuildCluster/Apps.dmk
@@ -40,3 +40,4 @@
 0	tools/vice
 0	tools/wlan_intel_fw
 0	multimedia/gnash
+0	guibased/OxygenOffice
diff --git a/SysBuild/xsys/OxygenOffice b/SysBuild/guibased/OxygenOffice
similarity index 91%
rename from SysBuild/xsys/OxygenOffice
rename to SysBuild/guibased/OxygenOffice
index 0735eea..74653dd 100644
--- a/SysBuild/xsys/OxygenOffice
+++ b/SysBuild/guibased/OxygenOffice
@@ -71,7 +71,7 @@
 
 (( MKPKG = $MKPKG | 4 ))
 
-SRCPATH=X11_2/Office
+SRCPATH=GuiBased/Apps
 
 premk() {
 	cd $TMPROOT
@@ -94,11 +94,14 @@ mk() {
 	#we do not need more archive data
 	rm -r de/RPMS
 	#generate the doc folder with licenses and readmes
-	mkdir -p usr/share/doc/OxygenOffice
-	mv de/readmes/* usr/share/doc/OxygenOffice
-	mv de/licenses/* usr/share/doc/OxygenOffice
+	mkdir -p $TMPROOT/usr/share/doc/OxygenOffice
+	mv de/readmes/* $TMPROOT/usr/share/doc/OxygenOffice
+	mv de/licenses/* $TMPROOT/usr/share/doc/OxygenOffice
 	rm -r de
-	mv $TMPROOT/opt/openoffice* $TMPROOT/opt/OxygenOffice
+	mv $TMPROOT/opt/openoffice.org $TMPROOT/opt/OxygenOffice
+	tar -C $TMPROOT/opt/openoffice.org3 -cf - .|tar -C $TMPROOT/opt/OxygenOffice -xvf -
+	rm -r $TMPROOT/opt/openoffice.org3
+	ln -sf ../OxygenOffice/basis3.0 $TMPROOT/opt/OxygenOffice/basis-link
 	rm $TMPROOT/opt/OxygenOffice/program/libxml2.so.*
 }