diff --git a/Documenation/SubmittingPatches.md b/Documentation/SubmittingPatches.md
similarity index 100%
rename from Documenation/SubmittingPatches.md
rename to Documentation/SubmittingPatches.md
diff --git a/accountsservice-0.6.13-0.bee b/accountsservice-0.6.13-0.bee
deleted file mode 100755
index 8a41bced2..000000000
--- a/accountsservice-0.6.13-0.bee
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/env beesh
-
-SRCURL[0]="http://www.freedesktop.org/software/accountsservice/accountsservice-${PKGVERSION}.tar.xz"
-
-PATCHURL[0]=""
-
-# BEE_CONFIGURE=compat
-
-# EXCLUDE=""
-
-
-build_in_sourcedir
-
-
-mee_extract() {
-    bee_extract ${@}
-}
-
-mee_patch() {
-    bee_patch ${@}
-}
-
-mee_configure() {
-    bee_configure 
-}
-
-mee_build() {
-    bee_build
-}
-
-mee_install() {
-    bee_install
-}
diff --git a/accountsservice.be0 b/accountsservice.be0
new file mode 100755
index 000000000..6815509c8
--- /dev/null
+++ b/accountsservice.be0
@@ -0,0 +1,85 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION accountsservice-0.6.13-1
+
+## 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://www.freedesktop.org/software/accountsservice/accountsservice-${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+=(/src/mariux/patches/accountsservice-disable-userload.patch)
+
+###############################################################################
+## 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/adwaita-icon-theme-3.18.0-1.bee b/adwaita-icon-theme.be0
similarity index 92%
rename from adwaita-icon-theme-3.18.0-1.bee
rename to adwaita-icon-theme.be0
index 2e5e6b77f..b06ee13f3 100755
--- a/adwaita-icon-theme-3.18.0-1.bee
+++ b/adwaita-icon-theme.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION adwaita-icon-theme-3.26.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.)
 
@@ -7,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]="http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${PKGVERSION[2]}/adwaita-icon-theme-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${PKGVERSION[2]}/adwaita-icon-theme-${PKGVERSION}.tar.xz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${PKGVERSIO
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {
diff --git a/bee.be0 b/bee.be0
index 2ae35b653..9787185aa 100755
--- a/bee.be0
+++ b/bee.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION bee-1.2.13-0
+# BEE_VERSION bee-1.2.14-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/cargo.be0 b/cargo.be0
deleted file mode 100755
index 43616ed3e..000000000
--- a/cargo.be0
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION cargo-0.17.0-0
-
-SRCURL[0]="https://github.com/rust-lang/cargo/archive/${PKGVERSION}.tar.gz"
-SRCURL[1]="https://static.rust-lang.org/dist/cargo-0.16.0-x86_64-unknown-linux-gnu.tar.gz"
-SRCURL[2]="http://anduin.linuxfromscratch.org/BLFS/rust/rust-installer-20161004.tar.xz"
-# PATCHURL+=()
-
-EXCLUDE+=(/usr/lib/rustlib)
-
-# build_in_sourcedir
-
-# sourcesubdir_append src
-
-BEE_BUILDTYPE=autotools
-
-#mee_extract() {
-#    bee_extract "${@}"
-#}
-
-#mee_patch() {
-#    bee_patch "${@}"
-#}
-
-mee_configure() {
-    export HOME=${S}
-    bee_configure --cargo=${S}/cargo-nightly-x86_64-unknown-linux-gnu/cargo/bin/cargo \
-    --disable-option-checking
-}
-
-#mee_build() {
-#    bee_build
-#}
-
-mee_install() {
-    mv ${S}/rust-installer-20161004/* ${S}/src/rust-installer
-    start_cmd make install DESTDIR=${D}
-}
-## by default this may be 'make install DESTDIR="${D}"'
diff --git a/clusterd.be0 b/clusterd.be0
index 7f2b1899a..58837221d 100755
--- a/clusterd.be0
+++ b/clusterd.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION clusterd-1.107-0
+# BEE_VERSION clusterd-1.109-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/colord-0.1.19-0.bee b/colord-0.1.19-0.bee
deleted file mode 100755
index e43319a32..000000000
--- a/colord-0.1.19-0.bee
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="http://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz"
-
-PATCHURL[0]=""
-
-# BEE_CONFIGURE=compat
-
-# BEE_BUILDTYPE=
-
-# EXCLUDE=""
-
-# build_in_sourcedir
-
-
-
-
-
-#mee_extract() {
-#    bee_extract "${@}"
-#}
-
-#mee_patch() {
-#    bee_patch "${@}"
-#}
-
-#mee_configure() {
-#    bee_configure 
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
diff --git a/colord.be0 b/colord.be0
new file mode 100755
index 000000000..6c61121ce
--- /dev/null
+++ b/colord.be0
@@ -0,0 +1,91 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION colord-1.3.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.)
+
+###############################################################################
+## 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://www.freedesktop.org/software/colord/releases/colord-${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-argyllcms-sensor \
+        --disable-gusb \
+        --disable-static \
+        --disable-systemd-login \
+        --disable-udev \
+        --with-daemon-user=colord
+}
+
+#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/ethtool-4.5-0.bee b/ethtool-4.5-0.bee
deleted file mode 100755
index 2916030de..000000000
--- a/ethtool-4.5-0.bee
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="https://www.kernel.org/pub/software/network/ethtool/ethtool-${PKGVERSION}.tar.xz"
-
-PATCHURL[0]=""
-
-# BEE_CONFIGURE=compat
-
-# BEE_BUILDTYPE=
-
-# EXCLUDE=""
-
-# build_in_sourcedir
-
-
-
-#mee_extract() {
-#    bee_extract ${@}
-#}
-
-#mee_patch() {
-#    bee_patch ${@}
-#}
-
-#mee_configure() {
-#    bee_configure 
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
diff --git a/ethtool.be0 b/ethtool.be0
new file mode 100755
index 000000000..331ecff28
--- /dev/null
+++ b/ethtool.be0
@@ -0,0 +1,85 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION ethtool-4.13-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://www.kernel.org/pub/software/network/ethtool/ethtool-${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/evince.be0 b/evince.be0
index 04e5ba29e..1385ea4f4 100755
--- a/evince.be0
+++ b/evince.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION evince-3.22.0-0
+# BEE_VERSION evince-3.26.0-0
 
 BEE_BUILDTYPE=configure
 
diff --git a/exo.be0 b/exo.be0
index 33dc5e2b5..9756b9b57 100755
--- a/exo.be0
+++ b/exo.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION exo-0.10.7-0
+# BEE_VERSION exo-0.10.7-1
 
 ## 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.)
@@ -15,7 +15,7 @@ SRCURL[0]="http://archive.xfce.org/src/xfce/exo/${PKGVERSION[2]}/exo-${PKGVERSIO
 ## Add URLs/pathes to patch files to the PATCHURL array.
 ## The sources will be patched in the order of the array.
 
-# PATCHURL+=()
+PATCHURL+=(/src/mariux/patches/0001-Use-freedesktop.org-mail-icon-name-compliant-Bug-137.patch)
 
 ###############################################################################
 ## Add filename patterns to the EXCLUDE array of files that should not
@@ -45,7 +45,7 @@ SRCURL[0]="http://archive.xfce.org/src/xfce/exo/${PKGVERSION[2]}/exo-${PKGVERSIO
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {
diff --git a/firefox.be0 b/firefox.be0
index 37f65fc19..7614ef304 100755
--- a/firefox.be0
+++ b/firefox.be0
@@ -2,7 +2,7 @@
 
 #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80'
 
-# BEE_VERSION firefox-55.0.3-0
+# BEE_VERSION firefox-57.0.2-1
 
 SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz"
 
@@ -17,10 +17,8 @@ mee_configure() {
         --without-system-icu \
         --without-system-nspr \
         --disable-dbus \
-        --disable-crashreporter \
         --disable-tests \
-        --enable-optimize \
-        --enable-safe-browsing
+        --enable-optimize
 }
 
 mee_build_post() {
@@ -63,10 +61,6 @@ mee_install_post() {
     start_cmd mkdir -p ${D}${DATADIR}/applications
     start_cmd desktop-file-install --dir ${D}${DATADIR}/applications ${B}/firefox.desktop
 
-    cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/defaults/pref/mariux64.js
-	pref("storage.nfs_filesystem", true);
-	EOF
-
   cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/defaults/pref/autoconfig.js
   // Any comment. You must start the file with a comment!
 pref("general.config.filename", "default_config_mariux.cfg");
@@ -75,11 +69,36 @@ EOF
 
   cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/default_config_mariux.cfg
 // Any comment. You must start the file with a comment!
+pref("storage.nfs_filesystem", true);
 pref("network.captive-portal-service.enabled",false);
 
 // Don't show WhatsNew on first run after every update
 pref("browser.startup.homepage_override.mstone","ignore");
 
+//disable slowStartup Notification
+pref("browser.slowStartup.notificationDisabled", true);
+pref("browser.slowStartup.maxSamples", 0);
+pref("browser.slowStartup.samples", 0);
+pref("browser.rights.3.shown", true);
+pref("startup.homepage_welcome_url", "");
+pref("startup.homepage_welcome_url.additional", "");
+pref("startup.homepage_override_url", "");
+pref("browser.laterrun.enabled", false);
+pref("browser.shell.checkDefaultBrowser", false);
+
+//disable daily pings to Mozilla about extensions and recent startup
+lockPref("extensions.getAddons.cache.enabled", false);
+
+//disable sending the URL of the website where a plugin crashed
+pref("dom.ipc.plugins.reportCrashURL", false);
+
+//disable auto update for extensions
+lockPref("extensions.update.autoUpdateDefault", false);
+
+//disable about:addons' Get Add-ons panel (uses Google-Analytics)
+pref("extensions.getAddons.showPane", false); // hidden pref
+pref("extensions.webservice.discoverURL", "");
+
 // Set default homepage - users can change
 // Requires a complex preference
 defaultPref("browser.startup.homepage","data:text/plain,browser.startup.homepage=http://twiki.molgen.mpg.de/foswiki/Main/WebHome");
@@ -87,10 +106,90 @@ defaultPref("browser.startup.homepage","data:text/plain,browser.startup.homepage
 // Don't ask to install the Flash plugin
 pref("plugins.notifyMissingFlash", false);
 
-// Disable health reporter
-lockPref("datareporting.healthreport.service.enabled", false);
+// Disable upload of health reports
+lockPref("datareporting.healthreport.uploadEnabled", false);
+//disable about:healthreport page (which connects to Mozilla for locale/css+js+json)
+lockPref("datareporting.healthreport.about.reportUrl", "data:text/plain,");
 
 // Disable all data upload (Telemetry and FHR)
+lockPref("toolkit.telemetry.unified", false);
+lockPref("toolkit.telemetry.enabled", false);
+lockPref("toolkit.telemetry.server", "");
+lockPref("toolkit.telemetry.newProfilePing.enabled", false);
+lockPref("toolkit.telemetry.shutdownPingSender.enabled", false);
+lockPref("toolkit.telemetry.updatePing.enabled", false);
+lockPref("toolkit.telemetry.bhrPing.enabled", false);
+lockPref("toolkit.telemetry.firstShutdownPing.enabled", false);
+lockPref("toolkit.telemetry.cachedClientID", "");
+lockPref("toolkit.telemetry.archive.enabled", false);
 lockPref("datareporting.policy.dataSubmissionEnabled", false);
+lockPref("browser.ping-centre.telemetry", false);
+
+//disable "Snippets" (Mozilla content shown on about:home screen)
+defaultPref("browser.aboutHomeSnippets.updateUrl", "https://127.0.0.1"); //test
+
+//disable experiments https://wiki.mozilla.org/Telemetry/Experiments
+defaultPref("experiments.enabled", false);
+defaultPref("experiments.manifest.uri", "");
+defaultPref("experiments.supported", false);
+defaultPref("experiments.activeExperiment", false);
+// disable Mozilla permission to silently opt you into tests
+defaultPref("network.allow-experiments", false);
+
+//disable pocket
+defaultPref("extensions.pocket.enabled", false);
+
+//disable flyweb https://flyweb.github.io/
+pref("dom.flyweb.enabled", false);
+
+//disable Shield https://wiki.mozilla.org/Firefox/Shield
+lockPref("extensions.shield-recipe-client.enabled", false);
+lockPref("extensions.shield-recipe-client.api_url", "");
+
+//disable Follow on Search and Activity Stream
+defaultPref("browser.newtabpage.activity-stream.enabled", false);
+defaultPref("browser.library.activity-stream.enabled", false);
+
+//disable link-mouseover opening connection to linked server
+lockPref("network.http.speculative-parallel-limit", 0);
+
+//disable pings (but enforce same host in case)
+lockPref("browser.send_pings", false);
+lockPref("browser.send_pings.require_same_host", true);
+
+//disable location bar using search - PRIVACY
+defaultPref("keyword.enabled", false);
+
+//disable location bar domain guessing - PRIVACY/SECURITY
+defaultPref("browser.fixup.alternate.enabled", false);
+
+//display all parts of the url in the location bar - helps SECURITY
+lockPref("browser.urlbar.trimURLs", false);
+
+//disable location bar making speculative connections (FF56+)
+lockPref("browser.urlbar.speculativeConnect.enabled", false);
+
+//disable SSL session tracking test
+defaultPref("security.ssl.disable_session_identifiers", true);
+
+//disable SSL Error Reporting
+defaultPref("security.ssl.errorReporting.automatic", false);
+defaultPref("security.ssl.errorReporting.enabled", false);
+defaultPref("security.ssl.errorReporting.url", "");
+
+//disable the DNT HTTP header, which is essentially USELESS
+defaultPref("privacy.donottrackheader.enabled", false);
+
+//set max popups from a single non-click event - default is 20!
+defaultPref("dom.popup_maximum", 3);
+
+//limit events that can cause a popup default is "change click dblclick mouseup pointerup notificationclick reset submit touchend"
+defaultPref("dom.popup_allowed_events", "click dblclick");
+
+//enable Firefox's built-in PDF reader
+defaultPref("pdfjs.disabled", false);
+
+//enable legacy extensions
+defaultPref("extensions.legacy.enabled",true);
 EOF
 }
diff --git a/glib2-2.44.1-0.bee b/glib2.be0
similarity index 80%
rename from glib2-2.44.1-0.bee
rename to glib2.be0
index a2f34e009..82b629b5c 100755
--- a/glib2-2.44.1-0.bee
+++ b/glib2.be0
@@ -1,8 +1,10 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION glib2-2.54.2-0
+
 SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/glib/${PKGVERSION[2]}/glib-${PKGVERSION}.tar.xz"
 
-PATCHURL+=(/src/mariux/download/mariux64-glib-2.44.0-0001-g_get_current_dir-use-get_current_dir_name-if-_GNU_S.patch)
+# PATCHURL+=()
 
 # BEE_CONFIGURE=compat
 
diff --git a/go.be0 b/go.be0
index 163eb58e1..c28c35bf2 100755
--- a/go.be0
+++ b/go.be0
@@ -1,8 +1,9 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION go-1.9.2-0
+# BEE_VERSION go-1.9.2-1
 
-SRCURL[0]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz"
+SRCURL[0]="https://storage.googleapis.com/golang/go1.4-bootstrap-20170531.tar.gz"
+SRCURL[1]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz"
 
 # PATCHURL+=()
 
@@ -12,10 +13,13 @@ build_in_sourcedir
 
 sourcesubdir_append src
 
-
-#mee_extract() {
-#    bee_extract "${@}"
-#}
+mee_extract() {
+    # extract bootstrap version of go-1.4 to arbitrary location
+    mkdir ${S}/bootstrap
+    bee_extract_do_tar "${1}" ${S}/bootstrap --strip-components 1
+    shift  
+    bee_extract "${@}"
+}
 
 #mee_patch() {
 #    bee_patch "${@}"
@@ -26,39 +30,48 @@ sourcesubdir_append src
 #}
 
 mee_build() {
-    export GOROOT_BOOTSTRAP=${PREFIX} \
-    GOROOT_FINAL=${LIBDIR}/go-${PKGVERSION}
-    start_cmd ${S}/make.bash #${BEE_MAKEFLAGS}
-    exit
+
+    cd ${S}/../bootstrap/src
+    ./make.bash
+
+    cd ${S}
+
+    export GOROOT_BOOTSTRAP=${S}/../bootstrap
+    export GOROOT_FINAL=${LIBDIR}/go
+
+    ./make.bash
 }
 
+
 mee_install() {
-    # Install Binaries
-    start_cmd mkdir -p ${D}${BINDIR}
-    start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}
-    start_cmd cp -r ${S}/../bin ${D}${LIBDIR}/go-${PKGVERSION}
-    cd ${D}${BINDIR}
-    start_cmd ln -s ../lib/go-${PKGVERSION}/bin/go go
-    start_cmd ln -s ../lib/go-${PKGVERSION}/bin/gofmt gofmt
+    # The binaries expect /scratch/local/bee-root/go/go-1.9.2-1/source to be copied or moved to /usr/lib/go
+    mkdir -p ${D}${BINDIR}
+
+    cp -r ${S}/../bin/. ${D}${BINDIR}
+
+    mkdir -p ${D}${LIBDIR}/go
+
+    # strace -s 200 -e file ${S}/../bin/go install -buildmode=shared std
 
     # Install standardlibs https://golang.org/pkg/#stdlib
-    LIBS="archive bufio builtin bytes compress container context crypto database \
-    debug encoding errors expvar flag fmt go hash html image index internal io \
-    log math mime net os path plugin reflect regexp runtime sort strconv strings \
-    sync syscall testing text time unicode unsafe"
 
-    start_cmd ${S}/../bin/go install -buildmode=shared std
+    LIBS="builtin context debug expvar go image io math \
+    path runtime strings testing unicode bufio bytes \
+    compress crypto encoding flag hash index mime net plugin reflect \
+    sort sync text unsafe archive cmd container database errors \
+    fmt html internal log os regexp strconv syscall time vendor"
 
-    start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}/src
+    echo "LIBS=${LIBS}"
+    
+    mkdir -p ${D}${LIBDIR}/go/src
     for i in $LIBS; do
-        start_cmd cp -r ${S}/${i} ${D}${LIBDIR}/go-${PKGVERSION}/src
+      cp -r ${S}/${i} ${D}${LIBDIR}/go/src
     done
 
     #Install tools for go
-    start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}/pkg
-    start_cmd cp -r ${S}/../pkg/tool ${D}${LIBDIR}/go-${PKGVERSION}/pkg
-    start_cmd cp -r ${S}/../pkg/include ${D}${LIBDIR}/go-${PKGVERSION}/pkg
-    start_cmd cp -r ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go-${PKGVERSION}/pkg
-    start_cmd cp -r ${S}/../pkg/linux_amd64_dynlink ${D}${LIBDIR}/go-${PKGVERSION}/pkg
+    mkdir -p ${D}${LIBDIR}/go/pkg
+    cp -r ${S}/../pkg/tool ${D}${LIBDIR}/go/pkg
+    cp -r ${S}/../pkg/include ${D}${LIBDIR}/go/pkg
+    cp -r ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go/pkg
+    
 }
-## by default this may be 'make install DESTDIR="${D}"'
diff --git a/gtk3-3.16.6-0.bee b/gtk3-3.16.6-0.bee
deleted file mode 100755
index 145467991..000000000
--- a/gtk3-3.16.6-0.bee
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz"
-
-PATCHURL[0]=""
-
-# BEE_CONFIGURE=compat
-
-# BEE_BUILDTYPE=
-
-# EXCLUDE=""
-
-# build_in_sourcedir
-
-
-
-
-
-#mee_extract() {
-#    bee_extract ${@}
-#}
-
-#mee_patch() {
-#    bee_patch ${@}
-#}
-
-mee_configure() {
-    bee_configure --enable-introspection --enable-xinerama
-}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
diff --git a/gtk3.be0 b/gtk3.be0
new file mode 100755
index 000000000..45eaf57fb
--- /dev/null
+++ b/gtk3.be0
@@ -0,0 +1,89 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION gtk3-3.22.26-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/gtk+/${PKGVERSION[2]}/gtk+-${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 \
+        --enable-introspection \
+        --enable-wayland-backend \
+        --enable-xinerama \
+        --enable-x11-backend
+}
+
+#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/keepassxc.be0 b/keepassxc.be0
new file mode 100755
index 000000000..2092628a6
--- /dev/null
+++ b/keepassxc.be0
@@ -0,0 +1,36 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION keepassxc-2.2.2-0
+
+# bee download https://github.com/keepassxreboot/keepassxc.git
+
+SRCURL[0]="/src/mariux/beeroot/downloads/keepassxc-${PKGVERSION}_p182_b0e6bcfa.tar.bz2"
+
+PATH=/usr/local/qt5/bin:$PATH
+
+# remove buggy cmake git ref settings
+PATCHURL[0]='/src/mariux/beeroot/downloads/keepassxc-2.2.2_p182_b0e6bcfa-git-get-refs.patch'
+
+# build_in_sourcedir
+
+# sourcesubdir_append src
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+#mee_configure() {
+#    bee_configure
+#}
+
+#mee_build() {
+#    bee_build
+#}
+
+#mee_install() {
+#    bee_install
+#}
diff --git a/xrandr-1.4.1-0.bee b/libXrandr.be0
similarity index 94%
rename from xrandr-1.4.1-0.bee
rename to libXrandr.be0
index 1c96ca49d..f2e9be912 100755
--- a/xrandr-1.4.1-0.bee
+++ b/libXrandr.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION libXrandr-1.5.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.)
 
@@ -7,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]="http://xorg.freedesktop.org/releases/individual/app/xrandr-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/lib/libXrandr-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/xrandr-${PKGVERSI
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {
diff --git a/libreoffice.be0 b/libreoffice.be0
index f0a0c749b..124f6645f 100755
--- a/libreoffice.be0
+++ b/libreoffice.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION libreoffice-5.4.2.2-0
+# BEE_VERSION libreoffice-5.4.4.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/libxkbcommon.be0 b/libxkbcommon.be0
new file mode 100755
index 000000000..a2045d7d9
--- /dev/null
+++ b/libxkbcommon.be0
@@ -0,0 +1,85 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION libxkbcommon-0.7.2-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://xkbcommon.org/download/libxkbcommon-${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/linux-4.9.71-196.bee b/linux-4.9.71-196.bee
new file mode 100755
index 000000000..497732226
--- /dev/null
+++ b/linux-4.9.71-196.bee
@@ -0,0 +1,905 @@
+#!/bin/env beesh
+
+# note: CONFIG=/boot/config-WHATEVER BEE_MAKEFLAGS='-j 40' ./linux-xxx.bee
+
+KERNELVERSION=${PKGVERSION}
+if [ -z "${PKGVERSION[3]}" ] ; then
+    KERNELVERSION=${KERNELVERSION}.0
+fi
+
+# append extra version to get for example 4.8.0-rc4
+KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH}
+
+echo $KERNELVERSION
+
+SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz"
+
+PATCHURL+=()
+
+# EXCLUDE=""
+
+#CONFIG=
+
+KERNELLOCAL=".mx64.${PKGREVISION}"
+FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}"
+
+B=${S}
+
+same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null) \
+    && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \
+    && exit
+
+#  aacraid
+#  https://storage.microsemi.com/en-us/downloads/linux_source/linux_source_code/productid=aha-1000-8e&dn=microsemi+adaptec+hba+1000-8e.php
+#  http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-55022.tgz
+#  http://twiki.molgen.mpg.de/foswiki/Medv/SoftwareRaid
+#  CONFIG_SCSI_AACRAID=m
+#
+build_aacraid_driver_update_and_do_depmod() {
+    local DRIVERBUILD=54013
+
+    pushd .
+
+    echo "aacraid driver"
+
+    mkdir -pv ${B}/aacraid_update
+    cd ${B}/aacraid_update
+    tar -xf /src/mariux/beeroot/downloads/aacraid_source_1.2.1-${DRIVERBUILD}.tgz
+    cd aacraid-1.2.1-${DRIVERBUILD}
+    chmod -x *
+    make -C ${B} M=${B}/aacraid_update/aacraid-1.2.1-${DRIVERBUILD} modules
+
+    mkdir -pv ${D}/lib/modules/${FULLKERNELVERSION}/updates/drivers/scsi/aacraid
+    cp -v aacraid.ko ${D}/lib/modules/${FULLKERNELVERSION}/updates/drivers/scsi/aacraid
+
+    cd ${D}/lib/modules/${FULLKERNELVERSION}
+    depmod -a -b ${D} ${FULLKERNELVERSION}
+
+    popd
+}
+
+plaininstall_for_modules() {
+    local dir=$1
+    local tar=$2
+    local url=$3
+    local xflags=$4
+    (
+        test -e $tar || wget $url
+        test -d $dir || tar xvf $tar
+        cd $dir
+        ./configure \
+            --prefix=/usr \
+            --with-linux=${S} \
+            --with-linux-obj=${B} \
+            $xflags
+        cd module
+        # depmod call fails when build as user, and would eventually mess up system dirs when run as root
+        sed -i -e 's/depmod/echo skipping depmod/' Makefile
+        make ${BEE_MAKEFLAGS}
+        make modules_install INSTALL_MOD_PATH=${D}
+    )
+}
+
+build_spl_zfs_extra_modules_and_do_depmod() {
+    pushd .
+
+    echo "spl/zfs"
+
+    mkdir -pv ${B}/spl_zfs_extra
+    cd ${B}/spl_zfs_extra
+
+    plaininstall_for_modules spl-0.7.3 spl-0.7.3.tar.gz \
+       https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/spl-0.7.3.tar.gz
+
+    plaininstall_for_modules zfs-0.7.3 zfs-0.7.3.tar.gz \
+       https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/zfs-0.7.3.tar.gz \
+       "--with-spl=${B}/spl_zfs_extra/spl-0.7.3"
+
+    cd ${D}/lib/modules/${FULLKERNELVERSION}
+    depmod -a -b ${D} ${FULLKERNELVERSION}
+
+    popd
+}
+
+mee_patch() {
+    echo "PATCH $@"
+    bee_patch $@
+}
+
+mee_configure() {
+    echo "configure $@"
+    cat >.config <<-EOF
+	CONFIG_LOCALVERSION="$KERNELLOCAL"
+	CONFIG_KERNEL_BZIP2=y
+	CONFIG_SYSVIPC=y
+	CONFIG_POSIX_MQUEUE=y
+	CONFIG_AUDIT=y
+	CONFIG_HIGH_RES_TIMERS=y
+	CONFIG_BSD_PROCESS_ACCT=y
+	CONFIG_BSD_PROCESS_ACCT_V3=y
+	CONFIG_TASK_XACCT=y
+	CONFIG_TASK_IO_ACCOUNTING=y
+	CONFIG_IKCONFIG=y
+	CONFIG_IKCONFIG_PROC=y
+	CONFIG_CGROUPS=y
+	CONFIG_MEMCG=y
+	CONFIG_MEMCG_SWAP=y
+	CONFIG_BLK_CGROUP=y
+	CONFIG_CGROUP_SCHED=y
+	CONFIG_CFS_BANDWIDTH=y
+	CONFIG_RT_GROUP_SCHED=y
+	CONFIG_CGROUP_PIDS=y
+	CONFIG_CGROUP_FREEZER=y
+	CONFIG_CGROUP_HUGETLB=y
+	CONFIG_CPUSETS=y
+	CONFIG_CGROUP_DEVICE=y
+	CONFIG_CGROUP_CPUACCT=y
+	CONFIG_CGROUP_PERF=y
+	CONFIG_CGROUP_DEBUG=y
+	CONFIG_USER_NS=y
+	CONFIG_BLK_DEV_INITRD=y
+	CONFIG_SLAB=y
+	CONFIG_MODULES=y
+	CONFIG_MODULE_UNLOAD=y
+	CONFIG_MODULE_FORCE_UNLOAD=y
+	CONFIG_MODVERSIONS=y
+	CONFIG_BLK_DEV_INTEGRITY=y
+	CONFIG_BLK_DEV_THROTTLING=y
+	CONFIG_PARTITION_ADVANCED=y
+	CONFIG_MAC_PARTITION=y
+	CONFIG_BSD_DISKLABEL=y
+	CONFIG_LDM_PARTITION=y
+	CONFIG_CFQ_GROUP_IOSCHED=y
+	CONFIG_SMP=y
+	CONFIG_IOSF_MBI=m
+	CONFIG_GART_IOMMU=y
+	CONFIG_NR_CPUS=256
+	CONFIG_PREEMPT_VOLUNTARY=y
+	CONFIG_MICROCODE_AMD=y
+	CONFIG_NUMA=y
+	CONFIG_TRANSPARENT_HUGEPAGE=y
+	CONFIG_HZ_1000=y
+	CONFIG_KEXEC=y
+	CONFIG_KEXEC_FILE=y
+	# CONFIG_RELOCATABLE is not set
+	CONFIG_PHYSICAL_ALIGN=0x1000000
+	CONFIG_COMPAT_VDSO=y
+	CONFIG_CMDLINE_BOOL=y
+	CONFIG_CMDLINE="init=/bin/systemd"
+	# CONFIG_ACPI_AC is not set
+	# CONFIG_ACPI_BATTERY is not set
+	CONFIG_ACPI_DOCK=y
+	CONFIG_CPU_IDLE_GOV_MENU=y
+	CONFIG_PCI_MMCONFIG=y
+	CONFIG_PCIEPORTBUS=y
+	CONFIG_PCI_IOV=y
+	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+	CONFIG_BINFMT_MISC=y
+	CONFIG_IA32_EMULATION=y
+	CONFIG_IA32_AOUT=y
+	CONFIG_NET=y
+	CONFIG_PACKET=m
+	CONFIG_PACKET_DIAG=m
+	CONFIG_UNIX=m
+	CONFIG_UNIX_DIAG=m
+	CONFIG_XFRM_USER=m
+	CONFIG_INET=y
+	CONFIG_IP_MULTICAST=y
+	CONFIG_IP_ADVANCED_ROUTER=y
+	CONFIG_IP_FIB_TRIE_STATS=y
+	CONFIG_IP_MULTIPLE_TABLES=y
+	CONFIG_IP_ROUTE_MULTIPATH=y
+	CONFIG_IP_ROUTE_VERBOSE=y
+	CONFIG_NET_IPIP=m
+	CONFIG_NET_IPGRE_DEMUX=m
+	CONFIG_NET_IPGRE=m
+	CONFIG_NET_IPGRE_BROADCAST=y
+	CONFIG_IP_MROUTE=y
+	CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+	CONFIG_IP_PIMSM_V1=y
+	CONFIG_IP_PIMSM_V2=y
+	CONFIG_NET_IPVTI=m
+	CONFIG_NET_FOU_IP_TUNNELS=y
+	CONFIG_INET_AH=m
+	CONFIG_INET_ESP=m
+	CONFIG_INET_IPCOMP=m
+	CONFIG_INET_XFRM_MODE_TRANSPORT=m
+	CONFIG_INET_XFRM_MODE_TUNNEL=m
+	CONFIG_INET_XFRM_MODE_BEET=m
+	CONFIG_INET_DIAG=m
+	CONFIG_INET_UDP_DIAG=m
+	CONFIG_TCP_CONG_ADVANCED=y
+	CONFIG_TCP_CONG_HSTCP=m
+	CONFIG_TCP_CONG_HYBLA=m
+	CONFIG_TCP_CONG_SCALABLE=m
+	CONFIG_TCP_CONG_LP=m
+	CONFIG_TCP_CONG_VENO=m
+	CONFIG_TCP_CONG_YEAH=m
+	CONFIG_TCP_CONG_ILLINOIS=m
+	CONFIG_TCP_CONG_DCTCP=m
+	CONFIG_TCP_CONG_CDG=m
+	CONFIG_TCP_MD5SIG=y
+	CONFIG_IPV6=m
+	CONFIG_IPV6_ROUTER_PREF=y
+	CONFIG_IPV6_ROUTE_INFO=y
+	CONFIG_IPV6_OPTIMISTIC_DAD=y
+	CONFIG_INET6_AH=m
+	CONFIG_INET6_ESP=m
+	CONFIG_INET6_IPCOMP=m
+	CONFIG_IPV6_MIP6=m
+	CONFIG_IPV6_ILA=m
+	CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+	CONFIG_IPV6_VTI=m
+	CONFIG_IPV6_SIT_6RD=y
+	CONFIG_IPV6_GRE=m
+	CONFIG_IPV6_MULTIPLE_TABLES=y
+	CONFIG_IPV6_SUBTREES=y
+	CONFIG_IPV6_MROUTE=y
+	CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+	CONFIG_IPV6_PIMSM_V2=y
+	CONFIG_NETFILTER=y
+	CONFIG_NF_CONNTRACK=m
+	CONFIG_NF_CONNTRACK_ZONES=y
+	CONFIG_NF_CONNTRACK_EVENTS=y
+	CONFIG_NF_CONNTRACK_TIMEOUT=y
+	CONFIG_NF_CONNTRACK_TIMESTAMP=y
+	CONFIG_NF_CT_PROTO_UDPLITE=m
+	CONFIG_NF_CONNTRACK_AMANDA=m
+	CONFIG_NF_CONNTRACK_FTP=m
+	CONFIG_NF_CONNTRACK_H323=m
+	CONFIG_NF_CONNTRACK_IRC=m
+	CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+	CONFIG_NF_CONNTRACK_SNMP=m
+	CONFIG_NF_CONNTRACK_PPTP=m
+	CONFIG_NF_CONNTRACK_SANE=m
+	CONFIG_NF_CONNTRACK_SIP=m
+	CONFIG_NF_CONNTRACK_TFTP=m
+	CONFIG_NF_CT_NETLINK=m
+	CONFIG_NF_CT_NETLINK_TIMEOUT=m
+	CONFIG_NF_CT_NETLINK_HELPER=m
+	CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+	CONFIG_NF_TABLES=m
+	CONFIG_NF_TABLES_INET=m
+	CONFIG_NF_TABLES_NETDEV=m
+	CONFIG_NFT_EXTHDR=m
+	CONFIG_NFT_META=m
+	CONFIG_NFT_CT=m
+	CONFIG_NFT_COUNTER=m
+	CONFIG_NFT_LOG=m
+	CONFIG_NFT_LIMIT=m
+	CONFIG_NFT_MASQ=m
+	CONFIG_NFT_REDIR=m
+	CONFIG_NFT_NAT=m
+	CONFIG_NFT_QUEUE=m
+	CONFIG_NFT_REJECT=m
+	CONFIG_NFT_COMPAT=m
+	CONFIG_NFT_HASH=m
+	CONFIG_NETFILTER_XTABLES=y
+	CONFIG_NETFILTER_XT_SET=m
+	CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+	CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+	CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+	CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+	CONFIG_NETFILTER_XT_TARGET_DSCP=m
+	CONFIG_NETFILTER_XT_TARGET_HMARK=m
+	CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+	CONFIG_NETFILTER_XT_TARGET_LOG=m
+	CONFIG_NETFILTER_XT_TARGET_MARK=m
+	CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+	CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+	CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+	CONFIG_NETFILTER_XT_TARGET_TEE=m
+	CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+	CONFIG_NETFILTER_XT_TARGET_TRACE=m
+	CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+	CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+	CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+	CONFIG_NETFILTER_XT_MATCH_BPF=m
+	CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+	CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+	CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+	CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+	CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+	CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+	CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+	CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+	CONFIG_NETFILTER_XT_MATCH_CPU=m
+	CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+	CONFIG_NETFILTER_XT_MATCH_DSCP=m
+	CONFIG_NETFILTER_XT_MATCH_ECN=y
+	CONFIG_NETFILTER_XT_MATCH_ESP=m
+	CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+	CONFIG_NETFILTER_XT_MATCH_HELPER=m
+	CONFIG_NETFILTER_XT_MATCH_HL=y
+	CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+	CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+	CONFIG_NETFILTER_XT_MATCH_IPVS=m
+	CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+	CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+	CONFIG_NETFILTER_XT_MATCH_MAC=m
+	CONFIG_NETFILTER_XT_MATCH_MARK=m
+	CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+	CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+	CONFIG_NETFILTER_XT_MATCH_OSF=m
+	CONFIG_NETFILTER_XT_MATCH_OWNER=m
+	CONFIG_NETFILTER_XT_MATCH_POLICY=m
+	CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+	CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+	CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+	CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+	CONFIG_NETFILTER_XT_MATCH_REALM=m
+	CONFIG_NETFILTER_XT_MATCH_RECENT=m
+	CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+	CONFIG_NETFILTER_XT_MATCH_STATE=m
+	CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+	CONFIG_NETFILTER_XT_MATCH_STRING=m
+	CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+	CONFIG_NETFILTER_XT_MATCH_TIME=m
+	CONFIG_NETFILTER_XT_MATCH_U32=y
+	CONFIG_IP_SET=m
+	CONFIG_IP_SET_BITMAP_IP=m
+	CONFIG_IP_SET_BITMAP_IPMAC=m
+	CONFIG_IP_SET_BITMAP_PORT=m
+	CONFIG_IP_SET_HASH_IP=m
+	CONFIG_IP_SET_HASH_IPMARK=m
+	CONFIG_IP_SET_HASH_IPPORT=m
+	CONFIG_IP_SET_HASH_IPPORTIP=m
+	CONFIG_IP_SET_HASH_IPPORTNET=m
+	CONFIG_IP_SET_HASH_MAC=m
+	CONFIG_IP_SET_HASH_NETPORTNET=m
+	CONFIG_IP_SET_HASH_NET=m
+	CONFIG_IP_SET_HASH_NETNET=m
+	CONFIG_IP_SET_HASH_NETPORT=m
+	CONFIG_IP_SET_HASH_NETIFACE=m
+	CONFIG_IP_SET_LIST_SET=m
+	CONFIG_IP_VS=m
+	CONFIG_IP_VS_RR=m
+	CONFIG_IP_VS_NFCT=y
+	CONFIG_NF_CONNTRACK_IPV4=m
+	CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+	CONFIG_NFT_DUP_IPV4=m
+	CONFIG_NF_TABLES_ARP=m
+	CONFIG_NF_LOG_ARP=m
+	CONFIG_NFT_CHAIN_NAT_IPV4=m
+	CONFIG_NFT_MASQ_IPV4=m
+	CONFIG_NFT_REDIR_IPV4=m
+	CONFIG_IP_NF_IPTABLES=m
+	CONFIG_IP_NF_MATCH_AH=m
+	CONFIG_IP_NF_MATCH_ECN=m
+	CONFIG_IP_NF_MATCH_RPFILTER=m
+	CONFIG_IP_NF_MATCH_TTL=m
+	CONFIG_IP_NF_FILTER=m
+	CONFIG_IP_NF_TARGET_REJECT=m
+	CONFIG_IP_NF_TARGET_SYNPROXY=m
+	CONFIG_IP_NF_NAT=m
+	CONFIG_IP_NF_TARGET_MASQUERADE=m
+	CONFIG_IP_NF_TARGET_NETMAP=m
+	CONFIG_IP_NF_TARGET_REDIRECT=m
+	CONFIG_IP_NF_MANGLE=m
+	CONFIG_IP_NF_TARGET_CLUSTERIP=m
+	CONFIG_IP_NF_TARGET_ECN=m
+	CONFIG_IP_NF_TARGET_TTL=m
+	CONFIG_IP_NF_RAW=m
+	CONFIG_IP_NF_ARPTABLES=m
+	CONFIG_IP_NF_ARPFILTER=m
+	CONFIG_IP_NF_ARP_MANGLE=m
+	CONFIG_NF_CONNTRACK_IPV6=m
+	CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+	CONFIG_NFT_DUP_IPV6=m
+	CONFIG_NFT_CHAIN_NAT_IPV6=m
+	CONFIG_NFT_MASQ_IPV6=m
+	CONFIG_NFT_REDIR_IPV6=m
+	CONFIG_IP6_NF_IPTABLES=m
+	CONFIG_IP6_NF_MATCH_AH=m
+	CONFIG_IP6_NF_MATCH_EUI64=m
+	CONFIG_IP6_NF_MATCH_FRAG=m
+	CONFIG_IP6_NF_MATCH_OPTS=m
+	CONFIG_IP6_NF_MATCH_HL=m
+	CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+	CONFIG_IP6_NF_MATCH_MH=m
+	CONFIG_IP6_NF_MATCH_RPFILTER=m
+	CONFIG_IP6_NF_MATCH_RT=m
+	CONFIG_IP6_NF_TARGET_HL=m
+	CONFIG_IP6_NF_FILTER=m
+	CONFIG_IP6_NF_TARGET_REJECT=m
+	CONFIG_IP6_NF_TARGET_SYNPROXY=m
+	CONFIG_IP6_NF_MANGLE=m
+	CONFIG_IP6_NF_RAW=m
+	CONFIG_IP6_NF_NAT=m
+	CONFIG_IP6_NF_TARGET_MASQUERADE=m
+	CONFIG_IP6_NF_TARGET_NPT=m
+	CONFIG_NF_TABLES_BRIDGE=m
+	CONFIG_BRIDGE_NF_EBTABLES=m
+	CONFIG_IP_DCCP=m
+	CONFIG_RDS=m
+	CONFIG_RDS_TCP=m
+	CONFIG_TIPC=m
+	CONFIG_L2TP=m
+	CONFIG_L2TP_V3=y
+	CONFIG_L2TP_IP=m
+	CONFIG_L2TP_ETH=m
+	CONFIG_BRIDGE=m
+	CONFIG_BRIDGE_VLAN_FILTERING=y
+	CONFIG_VLAN_8021Q=m
+	CONFIG_VLAN_8021Q_GVRP=y
+	CONFIG_VLAN_8021Q_MVRP=y
+	CONFIG_NET_SCHED=y
+	CONFIG_NET_SCH_CBQ=m
+	CONFIG_NET_SCH_HTB=m
+	CONFIG_NET_SCH_HFSC=m
+	CONFIG_NET_SCH_PRIO=m
+	CONFIG_NET_SCH_MULTIQ=m
+	CONFIG_NET_SCH_RED=m
+	CONFIG_NET_SCH_SFB=m
+	CONFIG_NET_SCH_SFQ=m
+	CONFIG_NET_SCH_TEQL=m
+	CONFIG_NET_SCH_TBF=m
+	CONFIG_NET_SCH_GRED=m
+	CONFIG_NET_SCH_DSMARK=m
+	CONFIG_NET_SCH_NETEM=m
+	CONFIG_NET_SCH_DRR=m
+	CONFIG_NET_SCH_MQPRIO=m
+	CONFIG_NET_SCH_CHOKE=m
+	CONFIG_NET_SCH_QFQ=m
+	CONFIG_NET_SCH_CODEL=m
+	CONFIG_NET_SCH_FQ_CODEL=m
+	CONFIG_NET_SCH_FQ=m
+	CONFIG_NET_SCH_HHF=m
+	CONFIG_NET_SCH_PIE=m
+	CONFIG_NET_SCH_PLUG=m
+	CONFIG_NET_CLS_BASIC=m
+	CONFIG_NET_CLS_TCINDEX=m
+	CONFIG_NET_CLS_ROUTE4=m
+	CONFIG_NET_CLS_FW=m
+	CONFIG_NET_CLS_U32=m
+	CONFIG_CLS_U32_PERF=y
+	CONFIG_CLS_U32_MARK=y
+	CONFIG_NET_CLS_RSVP=m
+	CONFIG_NET_CLS_RSVP6=m
+	CONFIG_NET_CLS_FLOW=m
+	CONFIG_NET_CLS_CGROUP=m
+	CONFIG_NET_CLS_BPF=m
+	CONFIG_NET_CLS_FLOWER=m
+	CONFIG_NET_EMATCH=y
+	CONFIG_NET_EMATCH_CMP=m
+	CONFIG_NET_EMATCH_NBYTE=m
+	CONFIG_NET_EMATCH_U32=m
+	CONFIG_NET_EMATCH_META=m
+	CONFIG_NET_EMATCH_TEXT=m
+	CONFIG_NET_CLS_ACT=y
+	CONFIG_NET_ACT_POLICE=m
+	CONFIG_NET_ACT_GACT=m
+	CONFIG_GACT_PROB=y
+	CONFIG_NET_ACT_MIRRED=m
+	CONFIG_NET_ACT_IPT=m
+	CONFIG_NET_ACT_NAT=m
+	CONFIG_NET_ACT_PEDIT=m
+	CONFIG_NET_ACT_SIMP=m
+	CONFIG_NET_ACT_SKBEDIT=m
+	CONFIG_NET_ACT_CSUM=m
+	CONFIG_NET_ACT_VLAN=m
+	CONFIG_NET_ACT_BPF=m
+	CONFIG_NET_ACT_CONNMARK=m
+	CONFIG_NET_CLS_IND=y
+	CONFIG_DNS_RESOLVER=y
+	CONFIG_NETLINK_DIAG=m
+	CONFIG_CGROUP_NET_PRIO=y
+	CONFIG_BT=m
+	CONFIG_BT_HCIBTUSB=m
+	CONFIG_BT_HCIUART=m
+	CONFIG_BT_HCIUART_BCSP=y
+	CONFIG_BT_HCIUART_ATH3K=y
+	CONFIG_BT_HCIUART_LL=y
+	CONFIG_BT_HCIUART_3WIRE=y
+	CONFIG_BT_HCIUART_INTEL=y
+	CONFIG_BT_HCIUART_BCM=y
+	CONFIG_BT_HCIUART_QCA=y
+	CONFIG_BT_HCIBCM203X=m
+	CONFIG_BT_HCIBPA10X=m
+	CONFIG_BT_HCIBFUSB=m
+	CONFIG_BT_HCIVHCI=m
+	CONFIG_BT_MRVL=m
+	CONFIG_BT_ATH3K=m
+	# CONFIG_WIRELESS is not set
+	CONFIG_DEVTMPFS=y
+	CONFIG_DEVTMPFS_MOUNT=y
+	CONFIG_CONNECTOR=y
+	CONFIG_PARPORT=y
+	CONFIG_PARPORT_PC=y
+	CONFIG_BLK_DEV_FD=y
+	CONFIG_BLK_DEV_LOOP=y
+	CONFIG_BLK_DEV_CRYPTOLOOP=y
+	CONFIG_BLK_DEV_DRBD=y
+	CONFIG_BLK_DEV_NBD=y
+	CONFIG_BLK_DEV_RAM=y
+	CONFIG_CDROM_PKTCDVD=y
+	CONFIG_ENCLOSURE_SERVICES=y
+	CONFIG_IDE=y
+	CONFIG_BLK_DEV_IDECD=y
+	CONFIG_IDE_GENERIC=y
+	CONFIG_BLK_DEV_CMD640=y
+	CONFIG_BLK_DEV_GENERIC=y
+	CONFIG_BLK_DEV_RZ1000=y
+	CONFIG_BLK_DEV_AMD74XX=y
+	CONFIG_BLK_DEV_JMICRON=y
+	CONFIG_BLK_DEV_SIS5513=y
+	CONFIG_BLK_DEV_SD=y
+	CONFIG_BLK_DEV_SR=y
+	CONFIG_BLK_DEV_SR_VENDOR=y
+	CONFIG_CHR_DEV_SG=y
+	CONFIG_SCSI_ENCLOSURE=y
+	CONFIG_SCSI_CONSTANTS=y
+	CONFIG_SCSI_LOGGING=y
+	CONFIG_SCSI_SCAN_ASYNC=y
+	CONFIG_SCSI_FC_ATTRS=y
+	CONFIG_SCSI_SAS_LIBSAS=y
+	CONFIG_SCSI_SAS_ATA=y
+	CONFIG_ISCSI_TCP=m
+	CONFIG_BLK_DEV_3W_XXXX_RAID=m
+	CONFIG_SCSI_HPSA=y
+	CONFIG_SCSI_3W_9XXX=m
+	CONFIG_SCSI_3W_SAS=m
+	CONFIG_SCSI_AACRAID=m
+	CONFIG_SCSI_AIC7XXX=y
+	CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+	# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+	CONFIG_SCSI_AIC79XX=y
+	CONFIG_AIC79XX_RESET_DELAY_MS=15000
+	# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+	CONFIG_SCSI_AIC94XX=m
+	# CONFIG_AIC94XX_DEBUG is not set
+	CONFIG_SCSI_MVSAS=m
+	CONFIG_SCSI_DPT_I2O=m
+	CONFIG_SCSI_ARCMSR=m
+	CONFIG_MEGARAID_NEWGEN=y
+	CONFIG_MEGARAID_MM=y
+	CONFIG_MEGARAID_MAILBOX=y
+	CONFIG_MEGARAID_LEGACY=y
+	CONFIG_MEGARAID_SAS=y
+	CONFIG_SCSI_MPT2SAS=y
+	CONFIG_SCSI_BUSLOGIC=y
+	CONFIG_SCSI_GDTH=m
+	CONFIG_SCSI_QLOGIC_1280=y
+	CONFIG_SCSI_DH=y
+	CONFIG_ATA=y
+	CONFIG_SATA_AHCI=y
+	CONFIG_SATA_SIL24=y
+	CONFIG_ATA_PIIX=y
+	CONFIG_SATA_NV=y
+	CONFIG_SATA_PROMISE=y
+	CONFIG_SATA_SIL=y
+	CONFIG_SATA_SIS=y
+	CONFIG_SATA_SVW=y
+	CONFIG_SATA_VIA=y
+	CONFIG_PATA_ATIIXP=y
+	CONFIG_PATA_JMICRON=y
+	CONFIG_PATA_MPIIX=y
+	CONFIG_MD=y
+	CONFIG_BLK_DEV_MD=y
+	CONFIG_MD_LINEAR=y
+	CONFIG_MD_RAID0=y
+	CONFIG_MD_RAID1=y
+	CONFIG_MD_RAID456=y
+	CONFIG_MD_MULTIPATH=y
+	CONFIG_BLK_DEV_DM=m
+	CONFIG_DM_CRYPT=m
+	CONFIG_DM_SNAPSHOT=m
+	CONFIG_DM_THIN_PROVISIONING=m
+	CONFIG_DM_MIRROR=m
+	CONFIG_DM_LOG_USERSPACE=m
+	CONFIG_DM_RAID=m
+	CONFIG_DM_ZERO=m
+	CONFIG_DM_MULTIPATH=m
+	CONFIG_DM_UEVENT=y
+	CONFIG_TARGET_CORE=m
+	CONFIG_ISCSI_TARGET=m
+	CONFIG_FUSION=y
+	CONFIG_FUSION_SPI=y
+	CONFIG_FUSION_FC=y
+	CONFIG_FUSION_SAS=y
+	CONFIG_FUSION_CTL=y
+	CONFIG_NETDEVICES=y
+	CONFIG_BONDING=m
+	CONFIG_DUMMY=y
+	CONFIG_MACVLAN=y
+	CONFIG_MACVTAP=y
+	CONFIG_VXLAN=m
+	CONFIG_NETCONSOLE=m
+	CONFIG_NETCONSOLE_DYNAMIC=y
+	CONFIG_TUN=y
+	CONFIG_VETH=y
+	CONFIG_NLMON=m
+	CONFIG_VORTEX=y
+	CONFIG_TYPHOON=y
+	CONFIG_ACENIC=y
+	CONFIG_ATL1=y
+	CONFIG_BNX2=y
+	CONFIG_TIGON3=y
+	CONFIG_BNX2X=y
+	CONFIG_CHELSIO_T1=y
+	CONFIG_CHELSIO_T3=y
+	CONFIG_NET_TULIP=y
+	CONFIG_DE2104X=y
+	CONFIG_TULIP=y
+	CONFIG_TULIP_MMIO=y
+	CONFIG_TULIP_NAPI=y
+	CONFIG_TULIP_NAPI_HW_MITIGATION=y
+	CONFIG_DE4X5=y
+	CONFIG_DL2K=y
+	CONFIG_S2IO=y
+	CONFIG_E100=y
+	CONFIG_E1000=y
+	CONFIG_E1000E=y
+	CONFIG_IGB=y
+	CONFIG_IGBVF=y
+	CONFIG_IXGB=m
+	CONFIG_IXGBE=m
+	CONFIG_SKGE=y
+	CONFIG_SKY2=y
+	CONFIG_FORCEDETH=y
+	# CONFIG_NET_PACKET_ENGINE is not set
+	CONFIG_NETXEN_NIC=m
+	CONFIG_8139CP=y
+	CONFIG_8139TOO=y
+	CONFIG_R8169=y
+	CONFIG_SIS900=y
+	CONFIG_SIS190=y
+	CONFIG_VIA_RHINE=y
+	CONFIG_VIA_VELOCITY=y
+	# CONFIG_WLAN is not set
+	CONFIG_INPUT_POLLDEV=y
+	CONFIG_INPUT_EVDEV=y
+	# CONFIG_SERIO_SERPORT is not set
+	CONFIG_SERIAL_8250=y
+	CONFIG_SERIAL_8250_CONSOLE=y
+	CONFIG_PRINTER=y
+	CONFIG_IPMI_HANDLER=y
+	CONFIG_IPMI_DEVICE_INTERFACE=y
+	CONFIG_IPMI_SI=y
+	CONFIG_IPMI_WATCHDOG=y
+	CONFIG_IPMI_POWEROFF=y
+	CONFIG_HPET=y
+	CONFIG_I2C_AMD756=y
+	CONFIG_I2C_AMD756_S4882=y
+	CONFIG_I2C_AMD8111=y
+	CONFIG_I2C_ISCH=y
+	CONFIG_I2C_PIIX4=y
+	CONFIG_I2C_NFORCE2=y
+	CONFIG_I2C_NFORCE2_S4985=y
+	CONFIG_I2C_SIS5595=y
+	CONFIG_I2C_SIS630=y
+	CONFIG_I2C_SIS96X=y
+	CONFIG_I2C_VIA=y
+	CONFIG_I2C_VIAPRO=y
+	CONFIG_WATCHDOG=y
+	CONFIG_I6300ESB_WDT=y
+	CONFIG_ITCO_WDT=y
+	CONFIG_ITCO_VENDOR_SUPPORT=y
+	CONFIG_HP_WATCHDOG=y
+	CONFIG_NV_TCO=y
+	CONFIG_MEDIA_SUPPORT=y
+	CONFIG_AGP=y
+	CONFIG_AGP_AMD64=y
+	CONFIG_AGP_INTEL=m
+	CONFIG_DRM=m
+	CONFIG_DRM_AMDGPU=m
+	CONFIG_DRM_AMDGPU_SI=y
+	CONFIG_DRM_AMDGPU_CIK=y
+	CONFIG_DRM_AMDGPU_USERPTR=y
+	CONFIG_DRM_NOUVEAU=m
+	CONFIG_DRM_I915=m
+	CONFIG_BACKLIGHT_CLASS_DEVICE=y
+	CONFIG_VGACON_SOFT_SCROLLBACK=y
+	CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
+	CONFIG_SOUND=y
+	CONFIG_SND=y
+	CONFIG_SND_MIXER_OSS=y
+	CONFIG_SND_PCM_OSS=y
+	CONFIG_SND_DYNAMIC_MINORS=y
+	CONFIG_SND_CTXFI=y
+	CONFIG_SND_EMU10K1=y
+	CONFIG_SND_EMU10K1X=y
+	CONFIG_SND_ENS1370=y
+	CONFIG_SND_ENS1371=y
+	CONFIG_SND_ES1938=y
+	CONFIG_SND_ES1968=y
+	CONFIG_SND_INTEL8X0=y
+	CONFIG_SND_SONICVIBES=y
+	CONFIG_SND_VIA82XX=y
+	CONFIG_SND_VIA82XX_MODEM=y
+	CONFIG_SND_YMFPCI=y
+	CONFIG_SND_HDA_INTEL=y
+	CONFIG_SND_HDA_CODEC_REALTEK=y
+	CONFIG_SND_HDA_CODEC_ANALOG=y
+	CONFIG_SND_HDA_CODEC_SIGMATEL=y
+	CONFIG_SND_HDA_CODEC_VIA=y
+	CONFIG_SND_HDA_CODEC_HDMI=y
+	CONFIG_SND_HDA_CODEC_CIRRUS=y
+	CONFIG_SND_HDA_CODEC_CONEXANT=y
+	CONFIG_SND_HDA_CODEC_CA0110=y
+	CONFIG_SND_HDA_CODEC_CA0132=y
+	CONFIG_SND_HDA_CODEC_CMEDIA=y
+	CONFIG_SND_HDA_CODEC_SI3054=y
+	CONFIG_SND_USB_AUDIO=m
+	CONFIG_HIDRAW=y
+	CONFIG_HID_DRAGONRISE=y
+	CONFIG_HID_KYE=y
+	CONFIG_HID_GYRATION=y
+	CONFIG_HID_TWINHAN=y
+	CONFIG_HID_LOGITECH_DJ=m
+	CONFIG_HID_NTRIG=y
+	CONFIG_HID_ORTEK=y
+	CONFIG_HID_PANTHERLORD=y
+	CONFIG_HID_PETALYNX=y
+	CONFIG_HID_SAMSUNG=y
+	CONFIG_HID_SUNPLUS=y
+	CONFIG_HID_GREENASIA=y
+	CONFIG_HID_SMARTJOYPLUS=y
+	CONFIG_HID_TOPSEED=y
+	CONFIG_HID_THRUSTMASTER=y
+	CONFIG_HID_ZEROPLUS=y
+	CONFIG_USB=y
+	CONFIG_USB_XHCI_HCD=y
+	CONFIG_USB_EHCI_HCD=y
+	# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+	CONFIG_USB_OHCI_HCD=y
+	CONFIG_USB_UHCI_HCD=y
+	CONFIG_USB_SL811_HCD=y
+	CONFIG_USB_STORAGE=y
+	CONFIG_USB_SERIAL=y
+	CONFIG_USB_SERIAL_FTDI_SIO=y
+	CONFIG_USB_SERIAL_OMNINET=y
+	CONFIG_USB_CHAOSKEY=m
+	CONFIG_EDAC=y
+	CONFIG_EDAC_MM_EDAC=y
+	CONFIG_EDAC_AMD64=y
+	CONFIG_EDAC_E752X=y
+	CONFIG_EDAC_I82975X=y
+	CONFIG_EDAC_I3000=y
+	CONFIG_EDAC_I3200=y
+	CONFIG_EDAC_IE31200=y
+	CONFIG_EDAC_X38=y
+	CONFIG_EDAC_I5400=y
+	CONFIG_EDAC_I7CORE=y
+	CONFIG_EDAC_I5000=y
+	CONFIG_EDAC_I5100=y
+	CONFIG_EDAC_I7300=y
+	CONFIG_EDAC_SBRIDGE=y
+	CONFIG_RTC_CLASS=y
+	# CONFIG_RTC_INTF_PROC is not set
+	CONFIG_AMD_IOMMU=y
+	CONFIG_EXT2_FS=y
+	CONFIG_EXT3_FS=y
+	CONFIG_EXT3_FS_POSIX_ACL=y
+	CONFIG_EXT4_FS_SECURITY=y
+	CONFIG_REISERFS_FS=y
+	CONFIG_REISERFS_PROC_INFO=y
+	CONFIG_REISERFS_FS_XATTR=y
+	CONFIG_REISERFS_FS_POSIX_ACL=y
+	CONFIG_JFS_FS=y
+	CONFIG_JFS_POSIX_ACL=y
+	CONFIG_JFS_STATISTICS=y
+	CONFIG_XFS_FS=y
+	CONFIG_XFS_QUOTA=y
+	CONFIG_XFS_POSIX_ACL=y
+	CONFIG_XFS_RT=y
+	CONFIG_BTRFS_FS=m
+	CONFIG_BTRFS_FS_POSIX_ACL=y
+	CONFIG_FANOTIFY=y
+	CONFIG_QUOTA=y
+	CONFIG_QUOTA_NETLINK_INTERFACE=y
+	# CONFIG_PRINT_QUOTA_WARNING is not set
+	CONFIG_QFMT_V2=m
+	CONFIG_AUTOFS4_FS=m
+	CONFIG_FUSE_FS=m
+	CONFIG_OVERLAY_FS=m
+	CONFIG_FSCACHE=y
+	CONFIG_FSCACHE_STATS=y
+	CONFIG_FSCACHE_HISTOGRAM=y
+	CONFIG_FSCACHE_DEBUG=y
+	CONFIG_CACHEFILES=y
+	CONFIG_CACHEFILES_DEBUG=y
+	CONFIG_CACHEFILES_HISTOGRAM=y
+	CONFIG_ISO9660_FS=m
+	CONFIG_JOLIET=y
+	CONFIG_ZISOFS=y
+	CONFIG_UDF_FS=m
+	CONFIG_MSDOS_FS=m
+	CONFIG_VFAT_FS=m
+	CONFIG_NTFS_FS=m
+	CONFIG_PROC_KCORE=y
+	CONFIG_TMPFS_POSIX_ACL=y
+	CONFIG_HUGETLBFS=y
+	CONFIG_ECRYPT_FS=m
+	CONFIG_ECRYPT_FS_MESSAGING=y
+	CONFIG_SQUASHFS=m
+	CONFIG_SQUASHFS_XATTR=y
+	CONFIG_SQUASHFS_LZ4=y
+	CONFIG_SQUASHFS_LZO=y
+	CONFIG_SQUASHFS_XZ=y
+	CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+	CONFIG_SQUASHFS_EMBEDDED=y
+	CONFIG_NFS_FS=m
+	CONFIG_NFS_V3_ACL=y
+	CONFIG_NFS_V4=m
+	CONFIG_NFS_SWAP=y
+	CONFIG_NFS_V4_1=y
+	CONFIG_NFS_FSCACHE=y
+	CONFIG_NFSD=m
+	CONFIG_NFSD_V3_ACL=y
+	CONFIG_NFSD_V4=y
+	CONFIG_CEPH_FS=m
+	CONFIG_CEPH_FSCACHE=y
+	CONFIG_CEPH_FS_POSIX_ACL=y
+	CONFIG_CIFS=m
+	CONFIG_CIFS_STATS=y
+	CONFIG_CIFS_XATTR=y
+	CONFIG_CIFS_POSIX=y
+	CONFIG_NLS_CODEPAGE_437=m
+	CONFIG_NLS_CODEPAGE_850=m
+	CONFIG_NLS_CODEPAGE_852=m
+	CONFIG_NLS_ISO8859_1=m
+	CONFIG_NLS_UTF8=m
+	CONFIG_DLM=m
+	CONFIG_PRINTK_TIME=y
+	CONFIG_DEBUG_INFO=y
+	CONFIG_MAGIC_SYSRQ=y
+	CONFIG_DEBUG_KERNEL=y
+	CONFIG_RCU_CPU_STALL_TIMEOUT=60
+	CONFIG_FUNCTION_TRACER=y
+	CONFIG_FTRACE_SYSCALLS=y
+	CONFIG_BLK_DEV_IO_TRACE=y
+	CONFIG_MEMTEST=y
+	CONFIG_EARLY_PRINTK_DBGP=y
+	CONFIG_SECURITYFS=y
+	CONFIG_CRYPTO_GCM=m
+	CONFIG_CRYPTO_ECB=y
+	CONFIG_CRYPTO_PCBC=y
+	CONFIG_CRYPTO_CMAC=y
+	CONFIG_CRYPTO_HMAC=y
+	CONFIG_CRYPTO_MD4=y
+	CONFIG_CRYPTO_SHA1=y
+	CONFIG_CRYPTO_SHA256=y
+	CONFIG_CRYPTO_ARC4=y
+	CONFIG_CRYPTO_DES=y
+	CONFIG_KVM=m
+	CONFIG_KVM_INTEL=m
+	CONFIG_KVM_AMD=m
+	CONFIG_KVM_DEVICE_ASSIGNMENT=y
+	CONFIG_CRC_ITU_T=y
+	CONFIG_FONTS=y
+	CONFIG_FONT_8x8=y
+	CONFIG_FONT_8x16=y
+	CONFIG_FONT_7x14=y
+	CONFIG_FONT_PEARL_8x8=y
+	CONFIG_FONT_ACORN_8x8=y
+	CONFIG_FONT_MINI_4x6=y
+	CONFIG_FONT_SUN8x16=y
+	CONFIG_FONT_SUN12x22=y
+	CONFIG_FONT_10x18=y
+EOF
+    make olddefconfig
+}
+
+mee_build() {
+    echo "build $@"
+    make ${BEE_MAKEFLAGS}
+}
+
+mee_install() {
+    echo "install $@"
+
+    make modules_install  INSTALL_MOD_PATH=${D}
+    make install          INSTALL_PATH=${D}/boot
+#    make firmware_install INSTALL_MOD_PATH=${D}
+
+    build_aacraid_driver_update_and_do_depmod
+    build_spl_zfs_extra_modules_and_do_depmod
+
+    rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build}
+
+    ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source
+    ln -sv /usr/src/linux/${PKGALLPKG}/build  ${D}/lib/modules/${FULLKERNELVERSION}/build
+
+    ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION}
+}
diff --git a/mesalib.be0 b/mesalib.be0
index b11e717c4..4650aa94c 100755
--- a/mesalib.be0
+++ b/mesalib.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION mesalib-17.2.4-0
+# BEE_VERSION mesalib-17.2.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.)
@@ -61,8 +61,7 @@ mee_configure() {
         --enable-osmesa \
         --enable-xa \
         --enable-glx-tls \
-        --with-llvm-shared-libs \
-        --with--platforms="drm,x11" \
+        --with-platforms="drm,x11,wayland" \
         --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \
         --with-vulkan-drivers="intel,radeon"
 }
diff --git a/nvidia_linux-4.9.71-196-340.102-0.bee b/nvidia_linux-4.9.71-196-340.102-0.bee
new file mode 100755
index 000000000..bad3ecf51
--- /dev/null
+++ b/nvidia_linux-4.9.71-196-340.102-0.bee
@@ -0,0 +1,90 @@
+#!/bin/env beesh
+
+# calculate package extra versions and legacy level
+# - use extraversions to define nvidia extraversion and/or legacy level
+# - legacy level should be the last part of extraversion
+# - legacy level 2 to 5 will be calculated from version number..
+
+mxnvversion=${PKGEXTRAVERSION##*_}
+: ${mxnvversion=current}
+
+nvextraversion="${PKGEXTRAVERSION_DASH}"
+
+if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then
+    nvextraversion="${nvextraversion%_*}"
+    nvextraversion="${nvextraversion#-${mxnvversion}}"
+else
+    if [ "${PKGVERSION:0:4}" = "340." ] ; then
+        mxnvversion="legacy5"
+    elif [ "${PKGVERSION:0:4}" = "304." ] ; then
+        mxnvversion="legacy4"
+    elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then
+        mxnvversion="legacy3"
+    elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then
+        mxnvversion="legacy2"
+    else
+        mxnvversion="current"
+    fi
+fi
+
+print_info "calculated mxnvversion    = '${mxnvversion}'"
+print_info "calculated nvextraversion = '${nvextraversion}'"
+
+NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run"
+
+SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}"
+PATCHURL+=('/src/mariux/patches/nvidia_340_runtimefix_for_kernel_4.9.patch')
+
+LINUXPKG=${PKGEXTRANAME}.${ARCH}
+
+LINUXKLOCALVER=$(beeversion --format "%v%-e.mx64.%r" "${LINUXPKG}")
+
+# '4.4.mx64.75' to '4.4.0.mx64.75'
+# '4.8.6.mx64.115' to '4.8.6.mx64.115'
+# '4.8-rc2.mx64.95' to '4.8.0-rc2.mx64.95'
+if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(-rc[0-9]{1,2})?(\.mx64.*) ]]; then
+    LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}${BASH_REMATCH[3]}"
+fi
+
+
+build_in_sourcedir
+sourcesubdir_append kernel
+
+: ${BEE_TMP_TMPDIR:=/tmp}
+
+mee_extract() {
+    LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2"
+
+    print_info "extracting nvidia archive .."
+
+    start_cmd rmdir ${S}
+    start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S}
+
+    if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then
+        LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source"
+    elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
+        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    else
+        print_info "extracting linux build ${LINUXPKG} .."
+        start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR}
+        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    fi
+
+    print_info "using kernel sources from ${LINUXSRCDIR} .."
+}
+
+mee_build_pre() {
+    ln -s ${LINUXSRCDIR}/include ${S}/include
+}
+
+mee_build() {
+	start_cmd make SYSSRC=${LINUXSRCDIR} module
+}
+
+mee_install() {
+    mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}
+
+    cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/
+
+    ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion}
+}
diff --git a/nvidia_linux-4.9.71-196-375.39-0.bee b/nvidia_linux-4.9.71-196-375.39-0.bee
new file mode 100755
index 000000000..7657b8ef1
--- /dev/null
+++ b/nvidia_linux-4.9.71-196-375.39-0.bee
@@ -0,0 +1,87 @@
+#!/bin/env beesh
+
+# calculate package extra versions and legacy level
+# - use extraversions to define nvidia extraversion and/or legacy level
+# - legacy level should be the last part of extraversion
+# - legacy level 2 to 5 will be calculated from version number..
+
+mxnvversion=${PKGEXTRAVERSION##*_}
+: ${mxnvversion=current}
+
+nvextraversion="${PKGEXTRAVERSION_DASH}"
+
+if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then
+    nvextraversion="${nvextraversion%_*}"
+    nvextraversion="${nvextraversion#-${mxnvversion}}"
+else
+    if [ "${PKGVERSION:0:4}" = "340." ] ; then
+        mxnvversion="legacy5"
+    elif [ "${PKGVERSION:0:4}" = "304." ] ; then
+        mxnvversion="legacy4"
+    elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then
+        mxnvversion="legacy3"
+    elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then
+        mxnvversion="legacy2"
+    else
+        mxnvversion="current"
+    fi
+fi
+
+print_info "calculated mxnvversion    = '${mxnvversion}'"
+print_info "calculated nvextraversion = '${nvextraversion}'"
+
+NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run"
+
+SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}"
+
+LINUXPKG=${PKGEXTRANAME}.${ARCH}
+
+LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}")
+
+# '4.4.mx64.75' to '4.4.0.mx64.75'
+if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then
+    LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}"
+fi
+
+
+build_in_sourcedir
+sourcesubdir_append kernel
+
+: ${BEE_TMP_TMPDIR:=/tmp}
+
+mee_extract() {
+    LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2"
+
+    print_info "extracting nvidia archive .."
+
+    start_cmd rmdir ${S}
+    start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S}
+
+    if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then
+        LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source"
+    elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
+        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    else
+        print_info "extracting linux build ${LINUXPKG} .."
+        start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR}
+        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    fi
+
+    print_info "using kernel sources from ${LINUXSRCDIR} .."
+}
+
+mee_build_pre() {
+    ln -s ${LINUXSRCDIR}/include ${S}/include
+}
+
+mee_build() {
+	start_cmd make SYSSRC=${LINUXSRCDIR} module
+}
+
+mee_install() {
+    mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}
+
+    cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/
+
+    ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion}
+}
diff --git a/rustc.be0 b/rustc.be0
index 18d7c51d4..a8ceed211 100755
--- a/rustc.be0
+++ b/rustc.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION rustc-1.16.0-0
+# BEE_VERSION rustc-1.21.0-2
 
 SRCURL[0]="https://static.rust-lang.org/dist/rustc-${PKGVERSION}-src.tar.gz"
 
@@ -26,11 +26,17 @@ export RUST_BACKTRACE=1
 mee_configure() {
     #rust creates .cargo dir in your home
     export HOME=${S}
-    ${S}/configure --prefix=${PREFIX}
+    ${S}/configure --prefix=${PREFIX} \
+                   --mandir=${MANDIR} \
+                   --libdir=${LIBDIR} \
+                   --enable-local-rust \
+                   --disable-rpath \
+                   --enable-extended \
+                   --disable-codegen-tests
 }
 
 mee_build() {
-    start_cmd make ${BEE_MAKEFLAGS}
+    CC=clang CXX=clang++ start_cmd make ${BEE_MAKEFLAGS}
 }
 
 mee_install() {
diff --git a/thunderbird.be0 b/thunderbird.be0
index a0d71a2df..eb0f3c92b 100755
--- a/thunderbird.be0
+++ b/thunderbird.be0
@@ -2,7 +2,7 @@
 
 #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80'
 
-# BEE_VERSION thunderbird-52.4.0-0
+# BEE_VERSION thunderbird-52.5.0-0
 
 SRCURL[0]="https://ftp.mozilla.org/pub/thunderbird/releases/${PKGVERSION}/source/thunderbird-${PKGVERSION}.source.tar.xz"
 
diff --git a/txt2man.be0 b/txt2man.be0
new file mode 100755
index 000000000..2ceb9e3a5
--- /dev/null
+++ b/txt2man.be0
@@ -0,0 +1,35 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION txt2man-1.6.0-0
+
+SRCURL[0]="https://github.com/mvertes/txt2man/archive/txt2man-${PKGVERSION}.tar.gz"
+
+PATCHURL[0]=""
+
+# BEE_CONFIGURE=compat
+
+# BEE_BUILDTYPE=
+
+# EXCLUDE=()
+
+# build_in_sourcedir
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+#mee_configure() {
+#    bee_configure
+#}
+
+#mee_build() {
+#    bee_build prefix=${PREFIX}
+#}
+
+mee_install() {
+    bee_install prefix=${D}/${PREFIX}
+}
diff --git a/wayland-protocols.be0 b/wayland-protocols.be0
new file mode 100755
index 000000000..4bf6692f0
--- /dev/null
+++ b/wayland-protocols.be0
@@ -0,0 +1,85 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION wayland-protocols-1.12-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://wayland.freedesktop.org/releases/wayland-protocols-${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/wayland.be0 b/wayland.be0
new file mode 100755
index 000000000..f6d75a8de
--- /dev/null
+++ b/wayland.be0
@@ -0,0 +1,86 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION wayland-1.14.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]="https://wayland.freedesktop.org/releases/wayland-${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-static
+}
+
+#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/wireshark-2.0.2-0.bee b/wireshark-2.0.2-0.bee
deleted file mode 100755
index b7fa0bffe..000000000
--- a/wireshark-2.0.2-0.bee
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="https://2.na.dl.wireshark.org/src/wireshark-${PKGVERSION}.tar.bz2"
-#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2"
-
-PATCHURL[0]=""
-
-# BEE_CONFIGURE=compat
-
-BEE_BUILDTYPE=configure
-
-# EXCLUDE=()
-
-build_in_sourcedir
-
-#mee_extract() {
-#    bee_extract "${@}"
-#}
-
-#mee_patch() {
-#    bee_patch "${@}"
-#}
-
-#mee_configure() {
-#    bee_configure 
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    bee_install
-#}
diff --git a/wireshark.be0 b/wireshark.be0
new file mode 100755
index 000000000..cda4e81f0
--- /dev/null
+++ b/wireshark.be0
@@ -0,0 +1,87 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION wireshark-2.4.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://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.xz"
+#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-${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+=(/src/mariux/patches/wireshark-2.4.3-lua_5_3-1.patch)
+
+###############################################################################
+## 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
+
+BEE_BUILDTYPE='autotools'
+
+###############################################################################
+## 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/xfce4-panel.be0 b/xfce4-panel.be0
index 07bf50d24..01067d96f 100755
--- a/xfce4-panel.be0
+++ b/xfce4-panel.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xfce4-panel-4.12.1-1
+# BEE_VERSION xfce4-panel-4.12.2-0
 
 SRCURL[0]="http://archive.xfce.org/src/xfce/xfce4-panel/${PKGVERSION[2]}/xfce4-panel-${PKGVERSION}.tar.bz2"
 PATCHURL[0]="/src/mariux/beeroot/downloads/xfce4-panel.patch"
diff --git a/xorg-server.be0 b/xorg-server.be0
index 159f181be..7bc0ab1e7 100755
--- a/xorg-server.be0
+++ b/xorg-server.be0
@@ -17,8 +17,6 @@ SRCURL[0]="https://ftp.x.org/pub/individual/xserver/xorg-server-${PKGVERSION}.ta
 
 # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch"
 
-PATCHURL+=(/src/mariux/patches/0001-os-Handle-SIGABRT.patch)
-
 ###############################################################################
 ## 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.
diff --git a/libXrandr-1.4.2-0.bee b/xrandr.be0
similarity index 94%
rename from libXrandr-1.4.2-0.bee
rename to xrandr.be0
index fac371256..7810f5f5b 100755
--- a/libXrandr-1.4.2-0.bee
+++ b/xrandr.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION xrandr-1.5.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.)
 
@@ -7,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]="http://xorg.freedesktop.org/releases/individual/lib/libXrandr-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/app/xrandr-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXrandr-${PKGVE
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {