diff --git a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb
index c10d20a..b8d3a76 100644
--- a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb
@@ -2,4 +2,4 @@
 
 SUMMARY = "meta-perl build test image"
 
-IMAGE_INSTALL += "packagegroup-meta-perl"
+IMAGE_INSTALL += "packagegroup-meta-perl packagegroup-meta-perl-extended"
diff --git a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb
index 3b776f8..a9b4cc3 100644
--- a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb
@@ -2,4 +2,8 @@
 
 SUMMARY = "meta-perl build ptest image"
 
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES += "ptest"
+
 IMAGE_INSTALL += "packagegroup-meta-perl-ptest"
diff --git a/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb b/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
index 6ab5a42..44c651c 100644
--- a/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
@@ -23,7 +23,7 @@
 
 S = "${WORKDIR}/Data-HexDump-${PV}"
 
-inherit cpan ptest
+inherit cpan ptest update-alternatives
 
 do_install_ptest () {
     install -d ${D}${PTEST_PATH}/t
@@ -31,3 +31,8 @@
 }
 
 BBCLASSEXTEND = "native"
+
+ALTERNATIVES_PRIORITY = "100"
+ALTERNATIVE_${PN} = "hexdump"
+ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump"
+
diff --git a/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.64.bb b/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.66.bb
similarity index 90%
rename from meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.64.bb
rename to meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.66.bb
index 468add9..aef1d34 100644
--- a/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.64.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.66.bb
@@ -14,8 +14,8 @@
            file://sqlite-perl-test.pl \
 "
 
-SRC_URI[md5sum] = "10796495b52927eb2e1df34c86924027"
-SRC_URI[sha256sum] = "f4ae8f7b50842305566aadd90f7bfd12a9e32b6c603a9b1c1529e73eb82aff01"
+SRC_URI[md5sum] = "38581209de5c981f0e79840c8937fa16"
+SRC_URI[sha256sum] = "89e75dff9f66c273e0e459d51f151f88960eb7d82e2821e6902f18688ba592fe"
 
 UPSTREAM_CHECK_REGEX = "DBD\-SQLite\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
 
diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.06.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb
similarity index 95%
rename from meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.06.bb
rename to meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb
index 24bde21..4b0c1d8 100644
--- a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.06.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb
@@ -15,8 +15,8 @@
 LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5"
 
 SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz"
-SRC_URI[md5sum] = "d2e51a37b4e1d5b16816604f02363637"
-SRC_URI[sha256sum] = "5b2dcd6861287880584e63b2e518840d483aa38da70194cf64d9957282851eea"
+SRC_URI[md5sum] = "a63fa96cbe236b2f7bb5a5e9fd740837"
+SRC_URI[sha256sum] = "34a4ec9b574b7a6c6132c4ab3ded490fd600bc7ce382124aeda58bb1e112910f"
 
 UPSTREAM_CHECK_REGEX = "Encode\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
 
diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.25.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.26.bb
similarity index 92%
rename from meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.25.bb
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.26.bb
index bda6ec1..3b96077 100644
--- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.25.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.26.bb
@@ -9,8 +9,8 @@
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5c0d1a6de317993e146ce6d37c897be5"
-SRC_URI[sha256sum] = "10931927d32d771817f9cd7d5502794f245a86cb403310db33656e493f67ff25"
+SRC_URI[md5sum] = "6db2562b6c42619e9c7d7e62422af8c4"
+SRC_URI[sha256sum] = "eabaecd0fdb3e6adef8c9e016e8509319f19caa8c76836253f7db72bafe56498"
 
 UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
 
diff --git a/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb b/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb
index 9b2406b..3fa56d4 100644
--- a/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb
@@ -3,40 +3,87 @@
 inherit packagegroup
 
 PROVIDES = "${PACKAGES}"
-PACKAGES = ' \
+PACKAGES = "\
     packagegroup-meta-perl \
     packagegroup-meta-perl-extended \
-'
+    ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-perl-ptest-packages", "", d)} \
+"
 
 RDEPENDS_packagegroup-meta-perl = "\
-    libproc-waitstat-perl libmoo-perl libterm-readkey-perl \
-    libunicode-linebreak-perl libcurses-perl libmime-types-perl \
-    libmime-charset-perl libio-socket-ssl-perl libio-stringy-perl \
-    libtext-iconv-perl libtext-charwidth-perl libtext-diff-perl \
-    libtext-wrapi18n-perl liblocale-gettext-perl libdata-hexdump-perl \
-    libextutils-installpaths-perl libextutils-helpers-perl libextutils-parsexs-perl \
-    libextutils-config-perl libextutils-cppguess-perl libimport-into-perl \
-    libcrypt-openssl-rsa-perl libcrypt-openssl-guess-perl libcrypt-openssl-random-perl \
-    libxml-sax-writer-perl libxml-libxml-perl libxml-filter-buffertext-perl \
     adduser \
-    libauthen-sasl-perl libnet-ldap-perl libnet-dns-perl \
-    libnet-dns-sec-perl libnet-libidn-perl libnet-ssleay-perl \
-    libnet-telnet-perl libdevel-globaldestruction-perl libipc-signal-perl \
-    librole-tiny-perl libencode-perl libencode-locale-perl \
-    libfile-slurp-perl libcapture-tiny-perl \
+    libalgorithm-diff-perl \
+    libauthen-sasl-perl \
+    libauthen-radius-perl \
+    libcapture-tiny-perl \
+    libcgi-perl \
+    libdbd-sqlite-perl \
+    libclass-method-modifiers-perl \
+    libdigest-hmac-perl \
+    libdigest-sha1-perl \
+    libconfig-autoconf-perl \
+    libcrypt-openssl-guess-perl \
+    libcrypt-openssl-random-perl \
+    libcrypt-openssl-rsa-perl \
+    libhtml-parser-perl \
+    libhtml-tree-perl \
+    libhtml-tagset-perl \
+    libimport-into-perl \
+    libio-socket-ssl-perl \
+    libio-stringy-perl \
+    libipc-signal-perl \
+    libcurses-perl \
+    libmime-charset-perl \
+    libmime-types-perl \
+    libmodule-pluggable-perl \
+    libmodule-runtime-perl \
+    libmodule-build-tiny-perl \
+    libdata-hexdump-perl \
+    libnet-dns-perl \
+    libnet-libidn-perl \
+    libnet-dns-sec-perl \
+    libnet-ldap-perl \
+    libnet-ssleay-perl \
+    libnet-telnet-perl \
+    libproc-waitstat-perl \
+    libdevel-globaldestruction-perl \
+    libenv-perl \
+    libfile-slurp-perl \
+    libfile-slurper-perl \
+    libtext-iconv-perl \
+    libtext-diff-perl \
+    libtext-charwidth-perl \
+    libtext-wrapi18n-perl \
+    libxml-libxml-perl \
+    libxml-filter-buffertext-perl \
+    libxml-sax-writer-perl \
+    libextutils-config-perl \
+    libextutils-cppguess-perl \
+    libextutils-helpers-perl \
+    libextutils-installpaths-perl \
+    libextutils-parsexs-perl \
+    liblocale-gettext-perl \
+    libmoo-perl \
+    librole-tiny-perl \
+    libunix-statgrab \
+    libstrictures-perl \
+    libsub-exporter-progressive-perl \
+    libsub-uplevel-perl \
+    libterm-readkey-perl \
+    libtest-deep-perl \
+    libtest-harness-perl \
+    libtest-nowarnings-perl \
+    libtest-warn-perl \
+    libtest-warnings-perl \
+    libunicode-linebreak-perl \
     po4a \
-    libstrictures-perl libtest-harness-perl libsub-exporter-progressive-perl \
-    libclass-method-modifiers-perl libhtml-parser-perl libhtml-tree-perl \
-    libmodule-pluggable-perl libmodule-build-perl libmodule-runtime-perl \
-    libmodule-build-tiny-perl libcgi-perl libalgorithm-diff-perl \
-    libdbd-sqlite-perl libdigest-sha1-perl libdigest-hmac-perl \
-    " 
+"
 
 RDEPENDS_packagegroup-meta-perl-extended = "\
-    logcheck mime-construct \
-    "
+    logcheck \
+    mime-construct \
+"
 
-RDEPENDS_packagegroup-meta-perl-ptest = "\
+RDEPENDS_packagegroup-meta-perl-ptest-packages = "\
     libmime-types-perl-ptest \
     libio-socket-ssl-perl-ptest \
     libdata-hexdump-perl-ptest \
@@ -47,6 +94,9 @@
     libtest-harness-perl-ptest \
     libdigest-sha1-perl-ptest \
     libdigest-hmac-perl-ptest \
-    "
+"
 
 EXCLUDE_FROM_WORLD = "1"
+
+# perl-module-encode is preferred over libencode-perl
+# libencode-locale-perl depends on libencode-perl
diff --git a/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb b/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb
index 5db5b8f..1b3aca5 100644
--- a/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb
+++ b/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb
@@ -6,7 +6,7 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a96fc9b4cc36d80659e694ea109f0325"
 
-SRC_URI = "git://alioth.debian.org/anonscm/git/po4a/po4a.git;protocol=https"
+SRC_URI = "git://github.com/mquinson/po4a.git;protocol=https"
 
 # v0.49
 SRCREV = "79ed87a577a543538fe39c7b60079981f5997072"