diff --git a/dbus-1.4.0-2.bee b/dbus-1.4.0-2.bee
new file mode 100755
index 000000000..87c361f04
--- /dev/null
+++ b/dbus-1.4.0-2.bee
@@ -0,0 +1,31 @@
+#!/bin/env beesh
+
+PGRP=( system )
+
+SRCURL[0]="http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz"
+
+PATCHES[0]=""
+
+# EXCLUDE=""
+
+
+LIBEXECDIR=/usr/lib/dbus-1.0
+
+B=${S}
+
+
+mee_configure() {
+    systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd)
+
+    bee_configure --with-dbus-user=dbus --with-systemdsystemunitdir=${systemdsystemunitdir}
+}
+
+mee_build() {
+    bee_build
+    make check
+}
+
+mee_install() {
+    bee_install
+}
+
diff --git a/dbus.be0 b/dbus.be0
deleted file mode 100755
index 453fb0e9b..000000000
--- a/dbus.be0
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION dbus-1.12.4-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://dbus.freedesktop.org/releases/dbus/dbus-${PKGVERSION}.tar.gz"
-
-###############################################################################
-## 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 built
-## outside the source directory and needs to be built 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
-
-LIBEXECDIR=/usr/lib/dbus-1.0
-
-###############################################################################
-## 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 "${@}"
-#}
-
-mee_configure() {
-    systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd)
-
-    bee_configure \
-        --with-dbus-user=dbus \
-        --enable-systemd \
-        --with-system-socket=/run/dbus/system_bus_socket \
-        --with-systemdsystemunitdir=${systemdsystemunitdir}
-}
-
-mee_build() {
-    bee_build
-    make check
-}
-
-#mee_install() {
-#    bee_install
-#}
-## 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/gnome-session-3.4.1-1.bee b/gnome-session-3.4.1-1.bee
new file mode 100755
index 000000000..9f32bef3d
--- /dev/null
+++ b/gnome-session-3.4.1-1.bee
@@ -0,0 +1,7 @@
+#!/usr/bin/env beesh
+
+SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/gnome-session/${PKGVERSION[2]}/gnome-session-${PKGVERSION}.tar.xz"
+
+mee_install_post() {
+     start_cmd mv ${D}${DATADIR}/xsessions{,.available}
+}
diff --git a/gnome-session-3.4.1-2.bee b/gnome-session-3.4.1-2.bee
deleted file mode 100755
index 32b29f53e..000000000
--- a/gnome-session-3.4.1-2.bee
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gnome-session/${PKGVERSION[2]}/gnome-session-${PKGVERSION}.tar.xz"
-
-mee_install_post() {
-     start_cmd mv ${D}${DATADIR}/xsessions{,.available}
-}
diff --git a/gvfs.be0 b/gvfs.be0
index 9d0efba62..892e80332 100755
--- a/gvfs.be0
+++ b/gvfs.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION gvfs-1.24.0-3
+# BEE_VERSION gvfs-1.24.0-2
 
 ## 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.)
diff --git a/libatasmart-0.17-0.bee b/libatasmart-0.17-0.bee
new file mode 100755
index 000000000..70137879c
--- /dev/null
+++ b/libatasmart-0.17-0.bee
@@ -0,0 +1,30 @@
+#!/bin/env beesh
+
+SRCURL[0]="http://0pointer.de/public/libatasmart-0.17.tar.gz"
+
+PATCHURL[0]=""
+
+PGRP=( uncategorized )
+
+
+
+# BEE_CONFIGURE=compat
+
+# EXCLUDE=""
+
+mee_patch() {
+    bee_patch
+}
+
+mee_configure() {
+    bee_configure 
+}
+
+mee_build() {
+    bee_build
+}
+
+mee_install() {
+    bee_install
+}
+
diff --git a/libatasmart.be0 b/libatasmart.be0
deleted file mode 100755
index 36cd133ea..000000000
--- a/libatasmart.be0
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION libatasmart-0.19-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]="http://0pointer.de/public/libatasmart-${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 built
-## outside the source directory and needs to be built 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 "${@}"
-#}
-
-#mee_configure() {
-#    bee_configure
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
-## 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/libgudev.be0 b/libgudev.be0
deleted file mode 100755
index 5a336209e..000000000
--- a/libgudev.be0
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION libgudev-232-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://ftp.gnome.org/pub/gnome/sources/libgudev/${PKGVERSION}/libgudev-${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 built
-## outside the source directory and needs to be built 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 "${@}"
-#}
-
-mee_configure() {
-    bee_configure \
-        --disable-umockdev
-}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
-## 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/libusb.be0 b/libusb-1.0.19-0.bee
similarity index 55%
rename from libusb.be0
rename to libusb-1.0.19-0.bee
index df04272e0..4b6265cd6 100755
--- a/libusb.be0
+++ b/libusb-1.0.19-0.bee
@@ -1,10 +1,8 @@
 #!/bin/env beesh
 
-# BEE_VERSION libusb-1.0.21-0
-
 PGRP=( uncategorized )
 
-SRCURL[0]="https://downloads.sourceforge.net/libusb/libusb-${PKGVERSION}.tar.bz2"
+SRCURL[0]="http://downloads.sourceforge.net/libusb/libusb-1.0.19.tar.bz2"
 
 PATCHES[0]=""
 
@@ -15,8 +13,7 @@ mee_patch() {
 }
 
 mee_configure() {
-    bee_configure \
-      --disable-static
+    bee_configure
 }
 
 mee_build() {
@@ -26,3 +23,4 @@ mee_build() {
 mee_install() {
     bee_install
 }
+
diff --git a/udisks.be0 b/ntp.be0
similarity index 89%
rename from udisks.be0
rename to ntp.be0
index 2489f0758..9acee98dd 100755
--- a/udisks.be0
+++ b/ntp.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION udisks-2.1.8-0
+# BEE_VERSION ntp-4.2.8p8-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.)
@@ -9,7 +9,7 @@
 ## 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://udisks.freedesktop.org/releases/udisks-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PKGVERSION[2]}/ntp-${PKGVERSION}.tar.gz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -24,8 +24,8 @@ SRCURL[0]="https://udisks.freedesktop.org/releases/udisks-${PKGVERSION}.tar.bz2"
 # EXCLUDE+=()
 
 ###############################################################################
-## Uncomment the next statement, if the software may not be able to be built
-## outside the source directory and needs to be built inside the source
+## 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
@@ -73,7 +73,7 @@ SRCURL[0]="https://udisks.freedesktop.org/releases/udisks-${PKGVERSION}.tar.bz2"
 ## 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.
+## You may remove all comments as long as SRCURL[0]="" is set.
 ##
 ## Everything in this file will be executed in a bash environment.
 ##
diff --git a/pulseaudio.be0 b/pulseaudio.be0
index e42d724e0..d993448a4 100755
--- a/pulseaudio.be0
+++ b/pulseaudio.be0
@@ -1,8 +1,8 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION pulseaudio-11.1-0
+# BEE_VERSION pulseaudio-10.0-0
 
-SRCURL[0]="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PKGVERSION}.tar.xz"
+SRCURL[0]="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PKGVERSION}.tar.xz"
 
 PATCHURL[0]=""
 
diff --git a/qt5.be0 b/qt5-5.4.1-0.bee
similarity index 55%
rename from qt5.be0
rename to qt5-5.4.1-0.bee
index 9e5fa7fbd..f8668ac30 100755
--- a/qt5.be0
+++ b/qt5-5.4.1-0.bee
@@ -1,15 +1,20 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION qt5-5.10.1-0
+SRCURL=(http://download.qt.io/official_releases/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-opensource-src-${PKGVERSION}.tar.gz)
 
-SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz"
+PATCHURL[0]="https://bugreports.qt.io/secure/attachment/46929/qtwebkit.diff"
 
 PREFIX=/usr/local/qt5
 
-# build_in_sourcedir
+build_in_sourcedir
 
 # BEE_MAKEFLAGS=-j1
 
+mee_patch() {
+  perl -i -pe 's"/Source"/qtwebkit/Source"' $F/qtwebkit.diff
+  bee_patch
+}
+
 mee_configure() {
     start_cmd ${S}/configure \
         -prefix ${PREFIX} \
@@ -19,8 +24,7 @@ mee_configure() {
         -sysconfdir ${SYSCONFDIR} \
         -nomake examples \
         -opensource \
-        -confirm-license \
-        -skip qtwebengine
+        -confirm-license
 }
 
 mee_build() {
diff --git a/scripts/convert-mxnetctl-to-udev-rule.go b/scripts/convert-mxnetctl-to-udev-rule.go
deleted file mode 100644
index 24c8988b7..000000000
--- a/scripts/convert-mxnetctl-to-udev-rule.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"strings"
-)
-
-func main() {
-	// Open the file and scan it.
-	f, _ := os.Open("/etc/local/mxnet")
-	scanner := bufio.NewScanner(f)
-
-	for scanner.Scan() {
-		line := scanner.Text()
-
-		// Split the line on commas.
-		parts := strings.Split(line, " ")
-
-		// Loop over the parts from the string.
-		for i := range parts {
-			fmt.Println(parts[i])
-		}
-		// Write a newline.
-		fmt.Println()
-	}
-}
diff --git a/scripts/update-systemd-from-27-to-238.sh b/scripts/update-systemd-from-27-to-238.sh
deleted file mode 100755
index d496750d0..000000000
--- a/scripts/update-systemd-from-27-to-238.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-set -x
-
-if ! { hostconfig mx64; }; then
-	echo "Please update the tag to *mx64* in `hostconfig` first."
-	exit 1
-fi
-
-bee remove sysvinit-2.88dsf-2.x86_64 udev-164-2.x86_64
-bee install -f systemd-238-0
-bee update -f dbus-1.12.4-0
-systemctl daemon-reexec
-systemctl restart dbus.service # restarts GDM
-#bee remove consolekit-0.4.4-0.x86_64 # needed by GDM to log in
-#bee update fhs-3.0 # good idea? Removes /var/run?
-bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-input-evdev upower xf86-video-amdgpu xf86-video-nouveau gvfs-1.24.0-3 gnome-session-3.4.1-2 libatasmart qt5 udisks vlc-3.0.0-0
-bee remove systemd-27-0.x86_64
-bee update -f systemd-238-0
-bee install udev_compat-1.0-0
-systemctl daemon-reload
-systemctl disable console-kit-daemon
-
-sed -i '/pam_ck_connector.so/d' /etc/pam.d/system-auth
-sed -i 's/required       pam_systemd.so create-session=1 kill-user=0 kill-session=0/optional       pam_systemd.so/' /etc/pam.d/system-auth
-
-echo "You can migrate to system-networkd."
-
-systemctl stop ntp
-systemctl stop unbound
-systemctl disable ntp
-systemctl disable unbound
-systemctl daemon-reload
-bee remove ntp-4.2.8p8-0.x86_64
-
-ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
-mkdir -p /etc/systemd/resolved.conf.d/
-echo -e "[Resolve]\\nDomains=molgen.mpg.de" >> /etc/systemd/resolved.conf.d/domains.conf
-echo -e "[Resolve]\\nLLMNR=no" >> /etc/systemd/resolved.conf.d/disable-llmnr.conf
-systemctl restart systemd-resolved
-
-ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-# just to be sure
-systemctl stop systemd-networkd
-systemctl disable systemd-networkd
diff --git a/systemd-27-0.bee b/systemd-27-0.bee
new file mode 100755
index 000000000..dfca9af52
--- /dev/null
+++ b/systemd-27-0.bee
@@ -0,0 +1,33 @@
+#!/bin/env beesh
+
+SRCURL[0]="http://www.freedesktop.org/software/systemd/systemd-${PKGVERSION}.tar.bz2"
+
+PGRP=( uncategorized )
+
+
+
+# BEE_CONFIGURE=compat
+
+# EXCLUDE=""
+
+mee_patch() {
+    bee_patch
+}
+
+mee_configure() {
+    bee_configure \
+        --with-distro=other \
+        --with-sysvinit-path="" \
+        --with-sysvrcd-path="" \
+        --with-pamlibdir="/lib/security" \
+        --with-rootdir=""
+}
+
+mee_build() {
+    bee_build
+}
+
+mee_install() {
+    bee_install
+}
+
diff --git a/systemd.be0 b/systemd.be0
deleted file mode 100755
index ecfcd60f4..000000000
--- a/systemd.be0
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION systemd-238-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://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz"
-
-###############################################################################
-## 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 built
-## outside the source directory and needs to be built 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 "${@}"
-#}
-
-mee_configure() {
-    bee_configure \
-        -Dblkid=true \
-        -Dbuildtype=release \
-        -Ddefault-dnssec=yes \
-        -Ddns-servers='141.14.16.1' \
-        -Dntp-servers='zeit.fu-berlin.de ntps1-0.cs.tu-berlin.de time.fu-berlin.de' \
-        -Dfirstboot=false \
-        -Dinstall-tests=false \
-        -Dldconfig=false \
-        -Drootprefix= \
-        -Drootlibdir=/lib \
-        -Dsplit-usr=true \
-        -Dsysusers=false \
-        -Ddefault-kill-user-processes=false \
-        -Db_lto=false
-}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
-## by default this may be 'make install DESTDIR="${D}"'
-
-mee_install_post() {
-    # Support Linux kernels built with `CONFIG_CMDLINE="init=/bin/systemd"`
-    ln -v ${D}/lib/systemd/systemd ${D}/bin/systemd
-
-    # Do not use tmpfs for `/tmp`
-    ln -vs /dev/null ${D}/etc/systemd/system/tmp.mount
-}
-
-###############################################################################
-##
-## 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/sysvinit-2.88dsf-2.bee b/sysvinit-2.88dsf-2.bee
new file mode 100755
index 000000000..574e65c8e
--- /dev/null
+++ b/sysvinit-2.88dsf-2.bee
@@ -0,0 +1,44 @@
+#!/bin/env beesh
+
+PGRP=( core )
+
+SRCURL[0]="http://ftp.twaren.net/Unix/NonGNU/sysvinit/sysvinit-2.88dsf.tar.bz2"
+
+PATCHES[0]=""
+
+# EXCLUDE=""
+
+B=${S}
+
+mee_patch() {
+    bee_patch
+    sed -i 's@Sending processes@& configured via /etc/inittab@g' \
+        src/init.c
+    sed -i -e 's/utmpdump wall/utmpdump/' \
+           -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile
+}
+
+mee_configure() {
+    true
+}
+
+mee_build() {
+    bee_build -C src
+}
+
+mee_install() {
+    bee_install ROOT=${D} -C src install
+    rm ${D}/bin/mountpoint
+    rm ${D}/sbin/sulogin
+    rm ${D}/usr/bin/last
+    rm ${D}/usr/bin/lastb
+    rm ${D}/usr/bin/mesg
+    rm ${D}/usr/bin/utmpdump
+    rm ${D}/usr/share/man/man1/last.1
+    rm ${D}/usr/share/man/man1/lastb.1
+    rm ${D}/usr/share/man/man1/mesg.1
+    rm ${D}/usr/share/man/man1/utmpdump.1
+    rm ${D}/usr/share/man/man1/mountpoint.1
+    rm ${D}/usr/share/man/man8/sulogin.8
+}
+
diff --git a/udev-164-2.bee b/udev-164-2.bee
new file mode 100755
index 000000000..892cb861e
--- /dev/null
+++ b/udev-164-2.bee
@@ -0,0 +1,37 @@
+#!/bin/env beesh
+
+PGRP=( core )
+
+UDEVCONFIG=20100128
+
+SRCURL[0]="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.bz2"
+SRCURL[1]="http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${UDEVCONFIG}.tar.bz2"
+
+
+PATCHES[0]=""
+
+EXCLUDE="^/usr/share/gtk-doc"
+
+SBINDIR=/sbin
+LIBEXECDIR=/lib/udev
+
+mee_configure() {
+
+    systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd)
+
+    bee_configure \
+        --with-rootlibdir=/lib \
+        --disable-introspection \
+        --with-systemdsystemunitdir=${systemdsystemunitdir}
+}
+
+mee_build() {
+    bee_build
+}
+
+mee_install() {
+    bee_install
+    cd ${S}/udev-config-${UDEVCONFIG}
+    make install DESTDIR=${D}
+}
+
diff --git a/udev_compat.be0 b/udev_compat.be0
deleted file mode 100755
index 545b00145..000000000
--- a/udev_compat.be0
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION udev_compat-1.0-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]=""
-
-###############################################################################
-## 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 built
-## outside the source directory and needs to be built 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 "${@}"
-#}
-
-#mee_configure() {
-#    bee_configure
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-mee_install() {
-    cd ${D}
-    tar xpf /src/mariux/beeroot/packages/udev-164-2.x86_64.bee.tar.bz2 \
-        /lib/libudev.so.0.9.3 \
-        /lib/libudev.so.0 \
-        /lib/libgudev-1.0.so.0.0.1
-}
-## 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/udisks-1.0.2-0.bee b/udisks-1.0.2-0.bee
new file mode 100755
index 000000000..f009a7201
--- /dev/null
+++ b/udisks-1.0.2-0.bee
@@ -0,0 +1,30 @@
+#!/bin/env beesh
+
+SRCURL[0]="http://hal.freedesktop.org/releases/udisks-1.0.2.tar.gz"
+
+PATCHURL[0]=""
+
+PGRP=( uncategorized )
+
+
+
+# BEE_CONFIGURE=compat
+
+# EXCLUDE=""
+
+mee_patch() {
+    bee_patch
+}
+
+mee_configure() {
+    bee_configure 
+}
+
+mee_build() {
+    bee_build
+}
+
+mee_install() {
+    bee_install
+}
+
diff --git a/upower-0.9.16-1.bee b/upower-0.9.16-0.bee
similarity index 66%
rename from upower-0.9.16-1.bee
rename to upower-0.9.16-0.bee
index a1e830a61..e5eac6e7c 100755
--- a/upower-0.9.16-1.bee
+++ b/upower-0.9.16-0.bee
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-SRCURL[0]="https://upower.freedesktop.org/releases/upower-${PKGVERSION}.tar.xz"
+SRCURL[0]="http://upower.freedesktop.org/releases/upower-${PKGVERSION}.tar.xz"
 
 PATCHURL[0]=""
 
@@ -24,10 +24,9 @@ PATCHURL[0]=""
 #    bee_patch "${@}"
 #}
 
-mee_configure() {
-    bee_configure \
-      --disable-static
-}
+#mee_configure() {
+#    bee_configure 
+#}
 
 #mee_build() {
 #    bee_build
diff --git a/util-linux.be0 b/util-linux.be0
index 23b26f8d2..04a61702d 100755
--- a/util-linux.be0
+++ b/util-linux.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION util-linux-2.31.1-1
+# BEE_VERSION util-linux-2.31.1-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.)
diff --git a/vlc.be0 b/vlc.be0
index 7fff003f5..4ce14aebb 100755
--- a/vlc.be0
+++ b/vlc.be0
@@ -1,11 +1,10 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION vlc-3.0.0-0
+# BEE_VERSION vlc-2.2.6-0
 
 SRCURL[0]="https://download.videolan.org/pub/videolan/vlc/${PKGVERSION}/vlc-${PKGVERSION}.tar.xz"
 
-# http://git.videolan.org/?p=vlc.git;a=commitdiff;h=8311cdc09fa06a192cc5ca34368d2116e57bb936
-PATCHURL+=(/src/mariux/patches/vlc.git-8311cdc09fa06a192cc5ca34368d2116e57bb936.patch)
+PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/vlc-2.2.6-ffmpeg3-1.patch"
 
 # EXCLUDE+=()
 
@@ -18,14 +17,13 @@ PATCHURL+=(/src/mariux/patches/vlc.git-8311cdc09fa06a192cc5ca34368d2116e57bb936.
 #    bee_extract "${@}"
 #}
 
-mee_patch() {
-    bee_patch "${@}"
-    start_cmd sed -i '/luaL_checkint(/s/checkint/checkinteger/' modules/lua/{demux,libs/*}.c
-}
+#mee_patch() {
+#    bee_patch "${@}"
+#}
 
 mee_configure() {
-    BUILDCC=gcc \
-    bee_configure
+    CFLAGS="-DLUA_COMPAT_5_1" \
+    bee_configure --disable-atmo
 }
 
 mee_build() {
diff --git a/xf86-input-evdev.be0 b/xf86-input-evdev.be0
index a2eca49bf..b6612c962 100755
--- a/xf86-input-evdev.be0
+++ b/xf86-input-evdev.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xf86-input-evdev-2.10.5-1
+# BEE_VERSION xf86-input-evdev-2.10.5-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.)
diff --git a/xf86-video-amdgpu.be0 b/xf86-video-amdgpu.be0
index 46849644c..87a6fec5f 100755
--- a/xf86-video-amdgpu.be0
+++ b/xf86-video-amdgpu.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xf86-video-amdgpu-1.4.0-1
+# BEE_VERSION xf86-video-amdgpu-1.4.0-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.)
diff --git a/xf86-video-nouveau.be0 b/xf86-video-nouveau.be0
index ca6dbce3e..3d0ea6844 100755
--- a/xf86-video-nouveau.be0
+++ b/xf86-video-nouveau.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xf86-video-nouveau-1.0.15-1
+# BEE_VERSION xf86-video-nouveau-1.0.15-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.)
diff --git a/xorg-server.be0 b/xorg-server.be0
index 038aa5e5d..3c420fdf5 100755
--- a/xorg-server.be0
+++ b/xorg-server.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xorg-server-1.19.6-1
+# BEE_VERSION xorg-server-1.19.6-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.)