diff --git a/openplugins-replace-pli.inc b/openplugins-replace-pli.inc
index 75a2174..65b8678 100644
--- a/openplugins-replace-pli.inc
+++ b/openplugins-replace-pli.inc
@@ -8,4 +8,4 @@ RCONFLICTS_${PN} = "${OLDPKG}"
 inherit gitpkgv
 PV = "2.0+git${SRCPV}"
 PKGV = "2.0+git${GITPKGV}"
-PR = "r0"
+PR = "r1"
diff --git a/openplugins.inc b/openplugins.inc
index 4edfa2a..218a4de 100644
--- a/openplugins.inc
+++ b/openplugins.inc
@@ -5,3 +5,36 @@ SRC_URI = "git://github.com/E2OpenPlugins/e2openplugin-${MODULE}.git;protocol=gi
 S="${WORKDIR}/git"
 
 SRCREV_pn-${PN} ?= "${AUTOREV}"
+
+PACKAGES =+ "${PN}-src"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dbg += "\
+	/usr/lib/enigma2/python/Plugins/*/*/.debug \
+	/usr/lib/enigma2/python/Plugins/*/*/*/.debug \
+	/usr/lib/enigma2/python/Plugins/*/*/*/*/.debug \
+	/usr/lib/enigma2/python/Plugins/*/*/*/*/*/.debug \
+	/usr/lib/enigma2/python/Plugins/*/*/*/*/*/*/.debug \
+	"
+
+FILES_${PN}-src = "\
+	/usr/lib/enigma2/python/*/*.py \
+	/usr/lib/enigma2/python/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*/*/*/*/*/*.py \
+	/usr/lib/enigma2/python/*/*/*/*/*/*/*/*/*/*/*.py \
+	"
+
+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', 'Enigma2 Plugin: %s', recursive=True, match_path=True, prepend=True)
+	do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.py$', 'enigma2-plugin-%s-src', 'Enigma2 Plugin: %s', recursive=True, match_path=True, prepend=True)
+	do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', 'Enigma2 Plugin: %s', recursive=True, match_path=True, prepend=True)
+}
diff --git a/task-openplugins.bb b/task-openplugins.bb
index 8cc08a1..d657de4 100644
--- a/task-openplugins.bb
+++ b/task-openplugins.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "E2OpenPlugins Task"
-PR = "r0"
+PR = "r1"
 
 inherit task