diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 9378b537fe5..b13a05c02ec 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -17,11 +17,12 @@ distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.gz"
 checksum=44acf012f0dd3b0c01bb2c5e53231076d7ed463166f581d22ef441b127e8c85f
 
 if [ "$CROSS_BUILD" ]; then
-	# XXX needs host edje_cc
-	hostmakedepends+=" automake gettext-devel libtool efl>=1.10"
+	hostmakedepends+="  automake gettext-devel libtool efl>=1.10 harfbuzz-devel"
+	configure_args+=" --with-eolian-cxx=/usr/bin/eolian_cxx"
+	configure_args+=" --with-eolian-gen=/usr/bin/eolian_gen"
 	configure_args+=" --with-bin-edje-cc=/usr/bin/edje_cc"
 	pre_configure() {
-		autoreconf -fi
+		NOCONFIGURE=1 autoreconf -fi
 	}
 fi
 
@@ -30,10 +31,16 @@ build_options="framebuffer gles2 harfbuzz opengl pulseaudio systemd wayland x11"
 # Enable harfbuzz, pulseaudio, wayland and x11 by default.
 build_options_default="harfbuzz pulseaudio wayland x11"
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	# Enable gles2 by default on x86.
-	build_options_default+=" gles2"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		# Enable gles2 by default on x86.
+		build_options_default+=" gles2"
+		;;
+	armv6l*)
+		# Disable neon.
+		configure_args+=" --disable-neon"
+		;;
+esac
 
 if [ "$build_option_fb" ]; then
 	configure_args+=" --enable-fb"
@@ -81,7 +88,8 @@ fi
 
 if [ "$build_option_x11" ]; then
 	configure_args+=" --with-x --enable-xinput22 --with-x11=xlib"
-	makedepends+=" libXcomposite-devel libXcursor-devel libXp-devel libXrandr-devel libXScrnSaver-devel"
+	makedepends+=" libXcomposite-devel libXcursor-devel libXp-devel"
+	makedepends+=" libXrandr-devel libXScrnSaver-devel"
 	makedepends+=" libXdamage-devel libXrender-devel libXi-devel libXinerama-devel"
 	makedepends+=" xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel"
 	makedepends+=" xcb-util-renderutil-devel xcb-util-wm-devel printproto"