diff --git a/libreoffice-5.0.2.2_0374db2-2.bee b/libreoffice-5.0.2.2_0374db2-2.bee
deleted file mode 100755
index 2fd824048..000000000
--- a/libreoffice-5.0.2.2_0374db2-2.bee
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env beesh
-
-## this file was created by bee init and should be executed to build a
-## bee-package. (Additional hints are located at the end of this file.)
-
-###############################################################################
-## The source URL(s) define the location of the sources that will be
-## downloaded. Version variables may be used to simplify reuse of this bee-file.
-
-SRCURL[0]=""
-
-###############################################################################
-## Add URLs/pathes to patch files to the PATCHURL array.
-## The sources will be patched in the order of the array.
-
-# PATCHURL+=()
-
-###############################################################################
-## Add filename patterns to the EXCLUDE array of files that should not
-## be added to you package but may be present in the image directory.
-
-# EXCLUDE+=()
-
-###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
-## directory.
-
-build_in_sourcedir
-
-###############################################################################
-## bee cannot detect buildtypes specified in subdirectories.
-## Sometimes packages "hide" the real sources in a subdirectory named
-## 'src' or 'cmake' or ..
-## use 'sourcesubdir_append' to specify this directory if known.
-
-# sourcesubdir_append src
-
-###############################################################################
-## Change the default (auto-detected) steps to
-## extract, patch, configure/setup, build and install the software.
-## Make sure the mee_install function does install everything to the
-## image directory "${D}"
-
-mee_extract() {
-	mkdir -p $S
-	cd $S
-	git clone /home/buczek/git/libreoffice-core .
-	git checkout -b tmp $PKGEXTRAVERSION
-
-	cache=/dev/shm/buczek/libreoffice
-	if test -d $cache/tarballs; then
-		mkdir external/tarballs
-		cp $cache/tarballs/* external/tarballs/
-	fi
-
-	if test -d $cache/repros/translations; then
-		cp -r $cache/repros/translations .
-	fi
-
-	if test -d $cache/repros/helpcontent2; then
-		cp -r $cache/repros/helpcontent2 .
-	fi
-
-
-	for f in base calc draw impress main math writer; do
-		if test -e $cache/icons/libreoffice5.0-$f.svg; then
-			cp $cache/icons/libreoffice5.0-$f.svg .
-		else
-			wget https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-$f-symbolic.svg \
-				-O libreoffice5.0-$f.svg
-		fi
-	done
-}
-
-#mee_patch() {
-#    bee_patch "${@}"
-#}
-
-PREFIX=/usr/local/libreoffice
-
-mee_configure() {
-
-    #./autogen.sh \
-    bee_configure \
-		--enable-verbose \
-		--enable-release-build \
-		--with-help \
-		--with-lang=de \
-		--with-jdk-home=/usr/local/java \
-		--with-ant-home=/package/mariux64/ant \
-		--without-junit \
-		--without-doxygen \
-		--disable-odk \
-		--disable-epm \
-		--enable-python=internal
-}
-
-mee_build() {
-    #bee_build
-    make
-}
-
-mee_install() {
-
-    #make install INSTALLDIR=$D/usr/local/libreoffice
-    bee_install INSTALLDIR=/usr/local/libreoffice
-
-    rm $D/gid_Module_*
-
-
-    mkdir -p ${D}/usr/local/bin
-    
-    for p in sbase sdraw simpress soffice scalc smath swriter ; do
-        echo ${p}
-        cat > ${D}/usr/local/bin/${p} <<-EOF
-			#!/bin/bash
-			exec /usr/local/libreoffice/program/${p} "\$@"
-		EOF
-		chmod -v 755 ${D}/usr/local/bin/${p}
-    done
-
-    for p in openoffice libreoffice{,${PKGVERSION[2]}} ; do
-        cat > ${D}/usr/local/bin/${p} <<-EOF
-			#!/bin/bash
-			exec /usr/local/libreoffice/program/soffice "\$@"
-		EOF
-		chmod -v 755 ${D}/usr/local/bin/${p}
-    done
-
-	mkdir -pv ${D}/usr/share/applications
-
-    for i in ${D}/usr/local/libreoffice/share/xdg/* ; do
-        b=$(basename ${i})
-        ln -sv /usr/local/libreoffice/share/xdg/${b} \
-               ${D}/usr/share/applications/libreoffice-${b}
-    done
-
-	mkdir -pv $D/usr/share/icons/hicolor/scalable/apps/
-	for f in base calc draw impress main math writer; do
-		cp $S/libreoffice5.0-$f.svg $D/usr/share/icons/hicolor/scalable/apps/
-	done
-	ln -s libreoffice5.0-main.svg $D/usr/share/icons/hicolor/scalable/apps/libreoffice5.0-startcenter.svg
-}
-
-## by default this may be 'make install DESTDIR="${D}"'
-
-###############################################################################
-##
-## Additional hints:
-##
-## The name of this bee-file should follow the following naming convention:
-##     pkgname-pkgversion-pkgrevision.bee
-##
-## You may remove all comments as long as SRCURL[0]="" is set.
-##
-## Everything in this file will be executed in a bash environment.
-##
-## Build the package by executing
-##     './pkg-version-N.bee' or
-##     'beesh ./pkg-version-N.bee'
-##
-## see http://beezinga.org/
-##
diff --git a/libreoffice.be0 b/libreoffice.be0
new file mode 100755
index 000000000..82d12776e
--- /dev/null
+++ b/libreoffice.be0
@@ -0,0 +1,122 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION libreoffice-5.3.0.3-0
+
+## this file was created by bee init and should be executed to build a
+## bee-package. (Additional hints are located at the end of this file.)
+
+###############################################################################
+## The source URL(s) define the location of the sources that will be
+## downloaded. Version variables may be used to simplify reuse of this bee-file.
+
+SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[3]}/libreoffice-${PKGVERSION}.tar.xz"
+
+###############################################################################
+## Add URLs/pathes to patch files to the PATCHURL array.
+## The sources will be patched in the order of the array.
+
+# PATCHURL+=()
+
+###############################################################################
+## Add filename patterns to the EXCLUDE array of files that should not
+## be added to you package but may be present in the image directory.
+
+# EXCLUDE+=()
+
+###############################################################################
+## Uncomment the next statement, if the software may not be able to be build
+## outside the source directory and need to be build inside the source
+## directory.
+
+# build_in_sourcedir
+
+###############################################################################
+## bee cannot detect buildtypes specified in subdirectories.
+## Sometimes packages "hide" the real sources in a subdirectory named
+## 'src' or 'cmake' or ..
+## use 'sourcesubdir_append' to specify this directory if known.
+
+# sourcesubdir_append src
+
+
+###############################################################################
+## Change the default (auto-detected) steps to
+## extract, patch, configure/setup, build and install the software.
+## Make sure the mee_install function does install everything to the
+## image directory "${D}"
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+mee_patch() {
+    bee_patch "${@}"
+    sed -e "/gzip -f/s/echo/set -x; echo/" \
+    -i bin/distro-install-desktop-integration
+}
+
+mee_configure() {
+    bee_configure \
+        --with-lang=de \
+        --with-help \
+        --with-jdk-home=/usr/local/java \
+        --with-ant-home=/package/mariux64/ant \
+        --without-doxygen \
+        --without-junit \
+        --disable-dconf \
+        --disable-epm \
+        --disable-odk \
+        --enable-release-build \
+        --enable-python=internal \
+        --with-system-apr \
+        --with-system-cairo \
+        --with-system-curl \
+        --with-system-expat \
+        --with-system-harfbuzz \
+        --with-system-icu \
+        --with-system-jpeg \
+        --with-system-lcms2 \
+        --with-system-libatomic_ops \
+        --with-system-libpng \
+        --with-system-libxml \
+        --with-system-neon \
+        --with-system-nss \
+        --with-system-odbc \
+        --with-system-openldap \
+        --with-system-openssl \
+        --with-system-poppler \
+        --with-system-postgresql \
+        --with-system-serf \
+        --with-system-zlib
+    sed -i 's/all: check-if-root build/all: build/g' ${B}/Makefile
+    sed -i 's/bootstrap: check-if-root compilerplugins/all: compilerplugins/g' ${B}/Makefile
+}
+
+mee_build() {
+    # https://bugs.documentfoundation.org/show_bug.cgi?id=100453
+    chmod 755 ${S}/bin/unpack-sources
+    bee_build
+}
+
+mee_install() {
+    start_cmd make ${BEE_MAKEFLAGS} distro-pack-install DESTDIR=${D}
+}
+## by default this may be 'make install DESTDIR="${D}"'
+
+###############################################################################
+##
+## Additional hints:
+##
+## The name of this bee-file should follow the following naming convention:
+##     pkgname-pkgversion-pkgrevision.bee
+##
+## You may remove all comments as long as SRCURL[0] is set.
+##
+## Everything in this file will be executed in a bash environment.
+##
+## Build the package by executing
+##     './pkg-version-N.bee' or
+##     'beesh ./pkg-version-N.bee'
+##
+## see http://beezinga.org/
+##