diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 85dbf5a976..04fbf43dec 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -4,7 +4,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(ecore, 0.9.9.017)
+AM_INIT_AUTOMAKE(ecore, 0.9.9.018)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index 46f41c15a6..443f6bad9c 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -7,7 +7,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(edje, 0.5.0.017)
+AM_INIT_AUTOMAKE(edje, 0.5.0.018)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/legacy/edje/debian/changelog b/legacy/edje/debian/changelog
index 3ae94cf3f5..95f2941924 100644
--- a/legacy/edje/debian/changelog
+++ b/legacy/edje/debian/changelog
@@ -1,4 +1,4 @@
-edje (0.5.0.017-1) unstable; urgency=low
+edje (0.5.0.018-1) unstable; urgency=low
 
   * a CVS snapshot release.
 
diff --git a/legacy/edje/src/bin/edje_main.c b/legacy/edje/src/bin/edje_main.c
index 991e39eaed..cd8f2a63b9 100644
--- a/legacy/edje/src/bin/edje_main.c
+++ b/legacy/edje/src/bin/edje_main.c
@@ -116,11 +116,11 @@ main_start(int argc, char **argv)
      }
    if (mode == 0)
      ecore_evas = ecore_evas_software_x11_new(NULL, 0,  0, 0, startw, starth);
-   if ((!ecore_evas) || (mode == 1))
+   if ((!ecore_evas) && (mode == 1))
      ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
-   if ((!ecore_evas) || (mode == 2))
+   if ((!ecore_evas) && (mode == 2))
      ecore_evas = ecore_evas_fb_new(NULL, 270,  startw, starth);
-   if ((!ecore_evas) || (mode == 3))
+   if ((!ecore_evas) && (mode == 3))
      ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth);
    
    if (!ecore_evas) return -1;
diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index f29c2fad7d..87325861c2 100644
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -7,7 +7,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(eet, 0.9.10.017)
+AM_INIT_AUTOMAKE(eet, 0.9.10.018)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in
index 8e2a8d3ca7..842502adcf 100644
--- a/legacy/embryo/configure.in
+++ b/legacy/embryo/configure.in
@@ -7,7 +7,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(embryo, 0.9.1.017)
+AM_INIT_AUTOMAKE(embryo, 0.9.1.018)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index 4139cd70b8..9bd1ba0edd 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -5,7 +5,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(evas, 0.9.9.018)
+AM_INIT_AUTOMAKE(evas, 0.9.9.019)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN