diff --git a/SysBuild/xsys/OpenOffice b/SysBuild/xsys/OpenOffice
index 6d0acb9..cf234f0 100644
--- a/SysBuild/xsys/OpenOffice
+++ b/SysBuild/xsys/OpenOffice
@@ -75,9 +75,14 @@ SRCPATH=X11_2/Office
 
 premk() {
 	cd $MAKEDIR
-	tar -zxvf $LFSSOURCE/$SRCPATH/OOo*.tar.gz
+	if [ "$MK64BIT" == "true" ]; then
+		tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_LinuxX86-64_install_wJRE_de.tar.gz
+		VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_LinuxX86-64_install_wJRE_de.tar.gz|awk -F "_" '{print $2}'`
+	else
+		tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_LinuxIntel_install_wJRE_de.tar.gz
+		VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_LinuxIntel_install_wJRE_de.tar.gz|awk -F "_" '{print $2}'`
+	fi
 	cd OOG*
-	VERSION=`ls $LFSSOURCE/$SRCPATH/OOo*.tar.gz|awk -F "_" '{print $3}'`
 	DSTPKGNAME=OpenOffice-$VERSION
 	PKGNAME=$DSTPKGNAME.tbz
 }
diff --git a/SysBuild/xsys/OxygenOffice b/SysBuild/xsys/OxygenOffice
index 5235c78..d91345d 100644
--- a/SysBuild/xsys/OxygenOffice
+++ b/SysBuild/xsys/OxygenOffice
@@ -75,13 +75,8 @@ SRCPATH=X11_2/Office
 
 premk() {
 	cd $TMPROOT
-	if [ ${MK64BIT} == "true" ]; then
-		tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_unxlngx6_install_de_rpm_64bit.tar.gz
-		VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_unxlngx6_install_de_rpm_64bit.tar.gz|awk -F "_" '{print $3}'`
-	else
-		tar -zxvf $LFSSOURCE/$SRCPATH/OOO_*_LinuxIntel_install_de.tar.gz
-		VERSION=`ls $LFSSOURCE/$SRCPATH/OOO_*_LinuxIntel_install_de.tar.gz|awk -F "_" '{print $3}'`
-	fi
+	tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_[0-9][0-9][0-9][0-9][0-9][0-9]_LinuxIntel_install_de.tar.gz
+	VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_[0-9][0-9][0-9][0-9][0-9][0-9]_LinuxIntel_install_de.tar.gz|awk -F "_" '{print $2}'`
 	DSTPKGNAME=OxygenOffice-$VERSION
 	PKGNAME=$DSTPKGNAME.tbz
 }