diff --git a/assume-gplv2.inc b/assume-gplv2.inc
index a4e46f9..d464a44 100644
--- a/assume-gplv2.inc
+++ b/assume-gplv2.inc
@@ -1,4 +1,4 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://../LICENSE.GPLv2;md5=eb723b61539feef013de476e68b5c50a"
 
-SRC_URI += "file://LICENSE.GPLv2"
+SRC_URI_append = " file://LICENSE.GPLv2"
diff --git a/enigma2-plugin-extensions-autobackup.bb b/enigma2-plugin-extensions-autobackup.bb
index 3e06cd8..d6698ab 100644
--- a/enigma2-plugin-extensions-autobackup.bb
+++ b/enigma2-plugin-extensions-autobackup.bb
@@ -1,10 +1,13 @@
 MODULE = "AutoBackup"
-DESCRIPTION = "Backup settings automatically"
+SUMMARY = "Backup settings and restore them automatically"
+DESCRIPTION = "Can create daily backups. Backups created will be restored automaticaly after a new flash."
 
 require openplugins-replace-pli.inc
 
 require openplugins-distutils.inc
 
+PACKAGE_ARCH = "all"
+
 # I spent over 2 hours trying to get the shell file to be executable. Sorry, I just gave up
 # and decided that this would be good enough until someone explains how to do this properly
 # with distutils.
diff --git a/enigma2-plugin-extensions-autobouquets.bb b/enigma2-plugin-extensions-autobouquets.bb
new file mode 100644
index 0000000..7da7f7a
--- /dev/null
+++ b/enigma2-plugin-extensions-autobouquets.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "28.2E stream bouquet downloader"
+SUMMARY = "scan dvb data for automatic bouquets creation on Enigma2 STB"
+MAINTAINER = "LraiZer"
+HOMEPAGE = "https://github.com/LraiZer/AutoBouquets"
+SECTION = "extra"
+PRIORITY = "optional"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb \
+    file://COPYING;md5=036b9f2d884ff3a35bed6ab09bafff32 \
+"
+
+inherit gitpkgv
+
+AUTOBOUQUETS_BRANCH ?= "release"
+SRCREV = "${AUTOREV}"
+PV = "1.0+git${SRCPV}"
+PKGV = "1.0+git${GITPKGV}"
+PR = "r2"
+
+INSANE_SKIP_${PN} += "already-stripped"
+
+SRC_URI="git://github.com/LraiZer/AutoBouquets.git;branch=${AUTOBOUQUETS_BRANCH}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} = "/usr/lib/enigma2/python/Plugins/Extensions/AutoBouquets"
+D_FILES_PN = "${D}${FILES_${PN}}"
+
+EXTRA_OECONF = ""
+
+do_install() {
+    install -d ${D_FILES_PN}
+    install -d ${D_FILES_PN}/locale
+    install -m 755 ${S}/autobouquetsreader ${D_FILES_PN}
+    install -m 755 ${S}/*.sh ${D_FILES_PN}
+    install -m 644 ${S}/*.py *.txt *.png ${D_FILES_PN}
+    install -m 644 ${S}/locale/*.* ${D_FILES_PN}/locale
+    install -m 644 ${S}/COPYING ${D_FILES_PN}
+    install -m 644 ${S}/LICENSE ${D_FILES_PN}
+
+    install -d ${D_FILES_PN}/locale/en_GB/LC_MESSAGES
+    install -d ${D_FILES_PN}/locale/ru/LC_MESSAGES
+    install -m 644 ${S}/locale/en_GB/LC_MESSAGES/*.* ${D_FILES_PN}/locale/en_GB/LC_MESSAGES
+    install -m 644 ${S}/locale/ru/LC_MESSAGES/*.* ${D_FILES_PN}/locale/ru/LC_MESSAGES
+}
+
diff --git a/enigma2-plugin-extensions-epgimportfilter.bb b/enigma2-plugin-extensions-epgimportfilter.bb
new file mode 100644
index 0000000..5061cfc
--- /dev/null
+++ b/enigma2-plugin-extensions-epgimportfilter.bb
@@ -0,0 +1,15 @@
+MODULE = "EPGImportFilter"
+DESCRIPTION = "EPGImport Filter"
+
+RDEPENDS_${PN} = "\
+	python-difflib \
+	python-shell \
+	"
+
+inherit gitpkgv
+PV = "1.0+git${SRCPV}"
+PKGV = "1.0+git${GITPKGV}"
+
+require openplugins-distutils.inc
+
+require assume-gplv2.inc
diff --git a/enigma2-plugin-extensions-hetweer.bb b/enigma2-plugin-extensions-hetweer.bb
new file mode 100644
index 0000000..8b1c90a
--- /dev/null
+++ b/enigma2-plugin-extensions-hetweer.bb
@@ -0,0 +1,24 @@
+MODULE = "HetWeer"
+DESCRIPTION = "HetWeer plugin"
+
+require openplugins-replace-pli.inc
+
+require openplugins-distutils.inc
+
+require assume-gplv2.inc
+
+PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
+do_install() {
+        install -d ${D}${PLUGINPATH}/Images
+        cp -r ${S}/plugin/* ${D}${PLUGINPATH}
+        chmod a+rX ${D}${PLUGINPATH}
+}
+
+
+pkg_postrm_${PN}() {
+#!/bin/sh
+rm -rf /usr/lib/enigma2/python/Plugins/Extensions/HetWeer
+exit 0
+}
+
+FILES_${PN} = "${PLUGINPATH}"
diff --git a/enigma2-plugin-extensions-openairplay.bb b/enigma2-plugin-extensions-openairplay.bb
index 7906e41..ed0567c 100644
--- a/enigma2-plugin-extensions-openairplay.bb
+++ b/enigma2-plugin-extensions-openairplay.bb
@@ -15,7 +15,7 @@ require openplugins.inc
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
 do_install() {
 	install -d ${D}${PLUGINPATH}
-	cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
+	cp -r --preserve=mode,links ${S}/plugin/* ${D}${PLUGINPATH}
 }
 
 FILES_${PN} = "${PLUGINPATH}"
diff --git a/enigma2-plugin-extensions-openwebif.bb b/enigma2-plugin-extensions-openwebif.bb
index 2efcb43..3a988f7 100644
--- a/enigma2-plugin-extensions-openwebif.bb
+++ b/enigma2-plugin-extensions-openwebif.bb
@@ -4,7 +4,17 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://README;firstline=10;lastline=12;md5=9c14f792d0aeb54e15490a28c89087f7"
 
 DEPENDS = "python-cheetah-native"
-RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl python-shell aio-grab python-compression"
+RDEPENDS_${PN} = "\
+	aio-grab \
+	python-cheetah \
+	python-compression\
+	python-json \
+	python-misc \
+	python-numbers \
+	python-pyopenssl \
+	python-shell \
+	python-unixadmin \
+	"
 
 inherit gitpkgv
 PV = "1+git${SRCPV}"
@@ -21,7 +31,8 @@ do_compile() {
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
 do_install_append() {
 	install -d ${D}${PLUGINPATH}
-	cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
+	cp -r ${S}/plugin/* ${D}${PLUGINPATH}
+	chmod a+rX ${D}${PLUGINPATH}
 }
 
 FILES_${PN} = "${PLUGINPATH}"
diff --git a/enigma2-plugin-extensions-ppanel.bb b/enigma2-plugin-extensions-ppanel.bb
index 5dbd9da..5a3c246 100644
--- a/enigma2-plugin-extensions-ppanel.bb
+++ b/enigma2-plugin-extensions-ppanel.bb
@@ -6,3 +6,8 @@ require openplugins-replace-pli.inc
 require openplugins-distutils.inc
 
 require assume-gplv2.inc
+
+PACKAGE_ARCH = "all"
+
+PACKAGES =+ "${PN}-example"
+FILES_${PN}-example = "/etc/ppanel/PPanel_tutorial.xml"
diff --git a/enigma2-plugin-systemplugins-autobouquetsmaker.bb b/enigma2-plugin-systemplugins-autobouquetsmaker.bb
new file mode 100644
index 0000000..ba4c5df
--- /dev/null
+++ b/enigma2-plugin-systemplugins-autobouquetsmaker.bb
@@ -0,0 +1,46 @@
+SUMMARY = "Automatically build and update bouquets from the DVB stream."
+DESCRIPTION = "Automatically build and update bouquets from the DVB stream."
+MAINTAINER = "oe-alliance team"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
+
+inherit autotools-brokensep gitpkgv pythonnative
+
+SRCREV = "${AUTOREV}"
+PV = "2.1+git${SRCPV}"
+PKGV = "2.1+git${GITPKGV}"
+PR = "r2"
+
+SRC_URI = "git://github.com/oe-alliance/AutoBouquetsMaker.git;protocol=git"
+
+EXTRA_OECONF = " \
+    BUILD_SYS=${BUILD_SYS} \
+    HOST_SYS=${HOST_SYS} \
+    STAGING_INCDIR=${STAGING_INCDIR} \
+    STAGING_LIBDIR=${STAGING_LIBDIR} \
+    "
+
+S = "${WORKDIR}/git"
+
+python populate_packages_prepend() {
+    enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True, extra_depends="enigma2")
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.py$', 'enigma2-plugin-%s-src', '%s (source files)', recursive=True, match_path=True, prepend=True, extra_depends="enigma2")
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\/.*\.po$', 'enigma2-plugin-%s-po', '%s (translations)', recursive=True, match_path=True, prepend=True)
+}
+
+pkg_preinst_${PN}_prepend() {
+#!/bin/sh
+echo "Checking for an ABM cache file"
+
+if [ -f /usr/lib/enigma2/python/Plugins/SystemPlugins/AutoBouquetsMaker/providers/providers.cache ]; then
+	rm -f /usr/lib/enigma2/python/Plugins/SystemPlugins/AutoBouquetsMaker/providers/providers.cache > /dev/null 2>&1
+	echo "Cache file has been removed"
+else
+	echo "No cache file found"
+fi
+}
diff --git a/enigma2-plugin-systemplugins-crossepg.bb b/enigma2-plugin-systemplugins-crossepg.bb
index 25e891f..ef31ffb 100644
--- a/enigma2-plugin-systemplugins-crossepg.bb
+++ b/enigma2-plugin-systemplugins-crossepg.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Handle your EPG on enigma2 from various sources (opentv, mhw, xmltv, custom sources)"
-HOMEPAGE = "https://github.com/E2OpenPlugins/e2openplugin-CrossEPG"
+HOMEPAGE = "https://github.com/oe-alliance/e2openplugin-${MODULE}"
 MODULE = "CrossEPG"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4fbd65380cdd255951079008b364516c"
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS += "libxml2 zlib python"
 
 inherit gitpkgv
-SRCREV = ""
-PV = "0.6.2+git${SRCPV}"
-PKGV = "0.6.2+git${GITPKGV}"
-PR = "r0"
 
 inherit python-dir
 
 require openplugins.inc
 
+SRC_URI = "git://github.com/oe-alliance/e2openplugin-${MODULE}.git"
+PV = "0.8.1+git${SRCPV}"
+PKGV = "0.8.1+git${GITPKGV}"
+
 FILES_${PN} = "/usr/*"
 FILES_${PN}-dbg += "/usr/crossepg/scripts/mhw2epgdownloader/.debug"
 
diff --git a/openplugins-distutils.inc b/openplugins-distutils.inc
index 34d57ab..bbffc92 100644
--- a/openplugins-distutils.inc
+++ b/openplugins-distutils.inc
@@ -1,5 +1,3 @@
 require openplugins.inc
 
-inherit distutils
-
-DISTUTILS_INSTALL_ARGS = "--root=${D} --install-lib=/usr/lib/enigma2/python/Plugins"
+inherit distutils-openplugins
diff --git a/openplugins.inc b/openplugins.inc
index 4edfa2a..5c91df1 100644
--- a/openplugins.inc
+++ b/openplugins.inc
@@ -1,7 +1,5 @@
-DEPENDS += "enigma2"
-
 SRC_URI = "git://github.com/E2OpenPlugins/e2openplugin-${MODULE}.git;protocol=git"
 
 S="${WORKDIR}/git"
 
-SRCREV_pn-${PN} ?= "${AUTOREV}"
+SRCREV = "${AUTOREV}"
diff --git a/task-openplugins.bb b/packagegroup-openplugins.bb
similarity index 81%
rename from task-openplugins.bb
rename to packagegroup-openplugins.bb
index dfc2cdc..1cdd775 100644
--- a/task-openplugins.bb
+++ b/packagegroup-openplugins.bb
@@ -1,16 +1,21 @@
 DESCRIPTION = "E2OpenPlugins Task"
 PR = "r0"
 
-inherit task
+inherit packagegroup
+
+# disabled because it contains mips32el code that breaks the arm build.
+# enigma2-plugin-systemplugins-crossepg
 
 DEPENDS = " \
 	enigma2-plugin-extensions-addstreamurl \
 	enigma2-plugin-extensions-antilogo \
 	enigma2-plugin-extensions-autobackup \
+	enigma2-plugin-extensions-autobouquets \
 	enigma2-plugin-extensions-bitrate \
 	enigma2-plugin-extensions-buienradar \
 	enigma2-plugin-extensions-changerootpassword \
 	enigma2-plugin-extensions-foreca \
+	enigma2-plugin-extensions-hetweer \
 	enigma2-plugin-extensions-meteoitalia2 \
 	enigma2-plugin-extensions-newsreader \
 	enigma2-plugin-extensions-nfsserver \
@@ -27,7 +32,6 @@ DEPENDS = " \
 	enigma2-plugin-extensions-streaminterface \
 	enigma2-plugin-extensions-wakeonlan \
 	enigma2-plugin-systemplugins-autoshutdown \
-	enigma2-plugin-systemplugins-crossepg \
 	enigma2-plugin-extensions-setpicon \
 	enigma2-plugin-extensions-xpower \
 	enigma2-plugin-extensions-meteoviewer \
@@ -35,6 +39,8 @@ DEPENDS = " \
 	enigma2-plugin-extensions-systemtools \
 	enigma2-plugin-extensions-cacheflush \
 	enigma2-plugin-extensions-analogclock \
+	enigma2-plugin-extensions-epgimportfilter \
+	enigma2-plugin-systemplugins-autobouquetsmaker \
 "
 
 require assume-gplv2.inc