diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am
index 58394f9b14..8ccb6e22ee 100644
--- a/legacy/evas/Makefile.am
+++ b/legacy/evas/Makefile.am
@@ -15,5 +15,5 @@ bin_SCRIPTS = evas-config
 
 EXTRA_DIST = README AUTHORS COPYING evas.spec evas.m4 FAQ-EVAS
 
-m4datadir = $(datadir)/aclocal
+m4datadir = @aclocaldir@
 m4data_DATA = evas.m4
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index 80cb10e983..a929d95174 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -28,6 +28,18 @@ LDFLAGS="$LDFLAGS -L$withval/lib";
 LIBS_TTF="-L"$withval"/lib"
 ])
 
+aclocal_usr=yes
+AC_ARG_ENABLE(aclocal_usr,
+[  --disable-aclocal_usr   disable evas forcibly puting evas.m4 in /usr/aclocal and use prefix instead],
+[
+  if test x$enableval = xyes; then
+    aclocal_usr=yes
+  else
+    aclocal_usr=no
+  fi		
+]
+)
+
 gl=yes
 AC_ARG_ENABLE(gl,
 [  --disable-gl            disable building with opengl support],
@@ -273,6 +285,13 @@ AC_SUBST(imlib2_libs)
 AC_SUBST(ttf_includes)
 AC_SUBST(ttf_libs)
 
+aclocaldir=$datadir"/aclocal"
+if test X"$aclocal_usr" = Xyes; then
+  aclocaldir="/usr/share/aclocal"
+fi
+
+AC_SUBST(aclocaldir)
+
 AC_OUTPUT([
 Makefile
 src/Makefile
diff --git a/legacy/evas/src/evas_misc.c b/legacy/evas/src/evas_misc.c
index f8649252aa..59afd691f2 100644
--- a/legacy/evas/src/evas_misc.c
+++ b/legacy/evas/src/evas_misc.c
@@ -641,7 +641,7 @@ double
 evas_screen_x_to_world(Evas e, int x)
 {
    if (!e) return 0;
-   return (double)((double)x * e->current.val_cache.mult_x)
+   return (double)((double)x / e->current.val_cache.mult_x)
      + e->current.viewport.x;
 }
 
@@ -649,6 +649,6 @@ double
 evas_screen_y_to_world(Evas e, int y)
 {
    if (!e) return 0;
-   return (double)((double)y * e->current.val_cache.mult_y)
+   return (double)((double)y / e->current.val_cache.mult_y)
      + e->current.viewport.y;
 }