diff --git a/packages/e17_libs/evas/build b/packages/e17_libs/evas/build
index efd33fa172..cc2ce0a0ed 100755
--- a/packages/e17_libs/evas/build
+++ b/packages/e17_libs/evas/build
@@ -19,7 +19,7 @@ $SCRIPTS/build libXrender
 $SCRIPTS/build $MESA
 
 cd $PKG_BUILD
-export LIBS="-liconv"
+export LIBS="-liconv -lstdc++"
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -37,10 +37,11 @@ export LIBS="-liconv"
             --enable-font-loader-eet \
             --with-x \
             --enable-software-xlib \
+            --enable-software-16-x11 \
             --enable-xrender-x11 \
             --disable-software-xcb \
             --disable-xrender-xcb \
-            --enable-gl-x11
+            --enable-gl-x11 \
 
 make
 
diff --git a/packages/e17_libs/evas/install b/packages/e17_libs/evas/install
index e43aeb9843..b72a492ee6 100755
--- a/packages/e17_libs/evas/install
+++ b/packages/e17_libs/evas/install
@@ -6,35 +6,38 @@ $SCRIPTS/install eet
 $SCRIPTS/install libpng
 $SCRIPTS/install jpeg
 $SCRIPTS/install tiff
-# static $SCRIPTS/install libungif
 $SCRIPTS/install libiconv
 $SCRIPTS/install freetype
 $SCRIPTS/install fontconfig
-# static $SCRIPTS/install libpthread-stubs
 $SCRIPTS/install libX11
 $SCRIPTS/install libXrender
 $SCRIPTS/install libXext
 $SCRIPTS/install $MESA
 
+SVN_RELEASE="-ver-pre-svn-04"
+[ $TARGET_LIBC = uClibc ] && ELIBC=uclibc || ELIBC=gnu
+
+SAVERS="eet jpeg png tiff"
+ENGINES="buffer gl_x11 software_16 software_16_x11 software_generic software_x11 xrender_x11"
+LOADERS="eet gif jpeg pmaps png tiff xpm"
+
 mkdir -p $INSTALL/usr/lib
   cp -PR $PKG_BUILD/src/lib/.libs/libevas*.so* $INSTALL/usr/lib
 
-for i in eet jpeg png tiff; do
-  mkdir -p $INSTALL/usr/lib/evas/modules/savers/$i/linux-uclibc-$TARGET_FAMILY-ver-pre-svn-04
+for i in $SAVERS; do
+  mkdir -p $INSTALL/usr/lib/evas/modules/savers/$i/linux-${ELIBC}-${TARGET_FAMILY}${SVN_RELEASE}
     cp -PR $PKG_BUILD/src/modules/savers/$i/.libs/module.so \
-           $INSTALL/usr/lib/evas/modules/savers/$i/linux-uclibc-$TARGET_FAMILY-ver-pre-svn-04
+           $INSTALL/usr/lib/evas/modules/savers/$i/linux-${ELIBC}-${TARGET_FAMILY}${SVN_RELEASE}
 done
 
-# ENGINES="software_generic fb buffer software_x11 software_16_x11 xrender_x11"
-ENGINES="buffer gl_x11 software_16 software_16_x11 software_generic software_x11 xrender_x11"
 for i in $ENGINES; do
-  mkdir -p $INSTALL/usr/lib/evas/modules/engines/$i/linux-uclibc-$TARGET_FAMILY-ver-pre-svn-04
+  mkdir -p $INSTALL/usr/lib/evas/modules/engines/$i/linux-${ELIBC}-${TARGET_FAMILY}${SVN_RELEASE}
     cp -PR $PKG_BUILD/src/modules/engines/$i/.libs/module.so \
-           $INSTALL/usr/lib/evas/modules/engines/$i/linux-uclibc-$TARGET_FAMILY-ver-pre-svn-04
+           $INSTALL/usr/lib/evas/modules/engines/$i/linux-${ELIBC}-${TARGET_FAMILY}${SVN_RELEASE}
 done
 
-for i in eet gif jpeg pmaps png tiff xpm; do
-  mkdir -p $INSTALL/usr/lib/evas/modules/loaders/$i/linux-uclibc-$TARGET_FAMILY-ver-pre-svn-04
+for i in $LOADERS; do
+  mkdir -p $INSTALL/usr/lib/evas/modules/loaders/$i/linux-${ELIBC}-${TARGET_FAMILY}${SVN_RELEASE}
     cp -PR $PKG_BUILD/src/modules/loaders/$i/.libs/module.so \
-           $INSTALL/usr/lib/evas/modules/loaders/$i/linux-uclibc-$TARGET_FAMILY-ver-pre-svn-04
+           $INSTALL/usr/lib/evas/modules/loaders/$i/linux-${ELIBC}-${TARGET_FAMILY}${SVN_RELEASE}
 done