diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 5b90b45..44df9ba 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -10,3 +10,4 @@ DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb648
 DIST perl-5.24.0-patches-1.tar.xz 17320 SHA256 7be09434e7d73f47be3d1d9f6e6f72f5e705a7b5cfbef07ee9b8b53b2a08ef14 SHA512 430c06d6298cbd5eb8b7db9947ca288fcd747e19652285278ac2a84c90cdf756463505c50e7bd97fbd98bb45119dc898d94c4fb7af50bb57d9c2b959cba0d944 WHIRLPOOL b1f3cf64af35cb9364563ede25d700ff6b0ebaa93f978b7d65a2085498cce0d20d527e00e0a2b17a3d7dc9ef81d85e68985ec0ec00560e9696a8eb3ee61f0383
 DIST perl-5.24.0-patches-2.tar.xz 17760 SHA256 8f9ce8895b85d6195cfa10690a28a9b8dbac683cb159ed3f3103e7b5f2bbf18d SHA512 1159dd53d40641f71c301e4be95c8964e6787cdc446578e66e8c97238fc99558c98b1fbc9e89b2d38206364e598ff1544ca1291c14a422d95089f0eea8926cc2 WHIRLPOOL e18ecf63532609dc36c7252f03a1a4d28529b9804dbb9c0d70cc1418a243ff9168a621cadeee52f69919a70312c83232c0857f907f991886cfae870ed4590286
 DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad
+DIST perl-cross-1.1.0.tar.gz 81414 SHA256 d02e1f60076307655ace2c63fe38832e6d81d6195af84a98221e1c617c6c733d SHA512 4c0f9dafd4d62d5215ffaced4f8fefa3cdfe5eefe30805a5e83311200ff0bb3a40076b5a784270da40f2650f6c5623e6bc829acead1ee83c43698ff2894768c2 WHIRLPOOL 35615a210a1e3c50f936b4655038c550544c1aa66fabb54ceffe1549fa9adf5919a910bda13143b5bf82ba7c3169de21a432e8248a94f11526dde9f37166261f
diff --git a/dev-lang/perl/perl-5.24.0-r1.ebuild b/dev-lang/perl/perl-5.24.0-r1.ebuild
index 20d0186..efc4cf1 100644
--- a/dev-lang/perl/perl-5.24.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.24.0-r1.ebuild
@@ -7,6 +7,7 @@ EAPI=6
 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 
 PATCH_VER=2
+CROSS_VER=1.1.0
 
 PERL_OLDVERSEN=""
 MODULE_AUTHOR=RJBS
@@ -22,6 +23,7 @@ SRC_URI="
 	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
 	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz
 	https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
 HOMEPAGE="http://www.perl.org/"
 
@@ -265,11 +267,22 @@ src_prepare() {
 
 	src_prepare_update_patchlevel_h
 
+	if tc-is-cross-compiler; then
+		cp -a ../perl-cross-${CROSS_VER}/* . || die
+		touch cpan/CPANPLUS/lib/CPANPLUS.pm || die
+		sed -i 's/MakeMaker\.pm .*/MakeMaker.pm effd272b3c9224af6fd0f6cae7183f33ec4b1106/' cnf/diffs/perl5-${PV}/liblist.patch || die
+	fi
+
 	if ! tc-is-static-only ; then
 		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
 		ln -s ${LIBPERL} libperl$(get_libname ) || die
 	fi
 
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
 	default
 }
 
@@ -302,12 +315,12 @@ src_configure() {
 	use sparc && myconf -Ud_longdbl
 
 	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EPREFIX}/usr/include
-	export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
 
 	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EPREFIX}/usr/include
-	export ZLIB_LIB=${EPREFIX}/usr/$(get_libdir)
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
 
 	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
 	myndbm='U'
@@ -384,15 +397,13 @@ src_configure() {
 	# allow fiddling via EXTRA_ECONF, bug 558070
 	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
 
-	sh Configure \
-		-des \
+	myconf \
 		-Duseshrplib \
 		-Darchname="${myarch}" \
 		-Dcc="$(tc-getCC)" \
 		-Doptimize="${CFLAGS}" \
 		-Dldflags="${LDFLAGS}" \
 		-Dprefix="${EPREFIX}"'/usr' \
-		-Dinstallprefix="${EPREFIX}"'/usr' \
 		-Dsiteprefix="${EPREFIX}"'/usr/local' \
 		-Dvendorprefix="${EPREFIX}"'/usr' \
 		-Dscriptdir="${EPREFIX}"'/usr/bin' \
@@ -418,13 +429,29 @@ src_configure() {
 		-Dcf_by='Gentoo' \
 		-Dmyhostname='localhost' \
 		-Dperladmin='root@localhost' \
-		-Dinstallusrbinperl='n' \
 		-Ud_csh \
 		-Dsh="${EPREFIX}"/bin/sh \
 		-Dtargetsh="${EPREFIX}"/bin/sh \
 		-Uusenm \
 		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}" || die "Unable to configure"
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
 }
 
 src_test() {