diff --git a/srcpkgs/evas/template b/srcpkgs/evas/template
index 4a1db4c87e5..32734dce9ab 100644
--- a/srcpkgs/evas/template
+++ b/srcpkgs/evas/template
@@ -2,14 +2,13 @@
 pkgname=evas
 version=1.7.9
 revision=1
-hostmakedepends="pkg-config"
+hostmakedepends="libtool pkg-config"
 makedepends="
  libpng-devel>=1.6 giflib-devel libjpeg-turbo-devel fontconfig-devel
  tiff-devel fribidi-devel harfbuzz-devel eet-devel>=${version} pixman-devel
- xcb-util-image-devel libICE-devel libXrender-devel libxcb-devel MesaLib-devel"
+ xcb-util-image-devel libICE-devel libXrender-devel libxcb-devel"
 build_style=gnu-configure
-configure_args="--disable-static --disable-install-examples
- --disable-wayland-shm --enable-gl-xlib"
+configure_args="--disable-static --disable-install-examples"
 homepage="http://enlightenment.org"
 short_desc="A hardware-accelerated canvas API"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -17,6 +16,15 @@ license="BSD"
 distfiles="http://download.enlightenment.org/releases/evas-${version}.tar.gz"
 checksum=1fd687e43ebe3031be4ac7628043eae1aafca83ce6d1d1f06ff3b59fb4c027f0
 
+if [ "$XBPS_TARGET_MACHINE" = "i686" ] || [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	configure_args+=" --enable-gl-xlib"
+	makedepends+=" MesaLib-devel"
+fi
+
+pre_configure() {
+	libtoolize -f
+}
+
 evas-devel_package() {
 	depends="eet-devel>=${version} pixman-devel fribidi-devel harfbuzz-devel
 		fontconfig-devel evas>=${version}_${revision}"