diff --git a/AUTHORS b/AUTHORS
index 414ee67..7af8764 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,3 +2,4 @@ The Rasterman (Carsten Haitzler) <raster@rasterman.com>
 Tim Horton <hortont424@gmail.com>
 Saumsung Electronics <tbd>
 Samsung SAIT <tbd>
+Bruno Tarquini <btarquini@gmail.com>
diff --git a/configure.ac b/configure.ac
index 4ae097c..1f9596c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,11 +151,11 @@ if test "x$have_software_xlib" = "xyes" -o "x$have_software_16_x11" = "xyes" -o
       [have_xlib="yes"],
       [have_xlib="no"])
    if test "x$want_evas_simple_x11" = "xyes"; then
-      x_libs="${x_libs} -lX11 -lXext -lXrender"
+      x_libs="${x_libs} -lX11"
    else
       x_dir=${x_dir:-/usr/X11R6}
       x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
+      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11"
    fi
 fi
 AM_CONDITIONAL(BUILD_X11, [test "x$have_xlib" = "xyes"])
diff --git a/src/bin/main.c b/src/bin/main.c
index ba0bd8d..0b77411 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1382,7 +1382,7 @@ main(int argc, char **argv)
 
    evas_free(evas);
 
-   evas_shutdown();
    engine_shutdown();
+   evas_shutdown();
    return 0;
 }