diff --git a/configure.in b/configure.in
index 8004e69..8175327 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,11 @@ AC_CHECK_HEADER(Evas_Engine_XRender_X11.h,
   [ dummy=no ],
   [ #include <Evas.h> ]
 )
+AC_CHECK_HEADER(Evas_Engine_Software_16_X11.h,
+  [ AC_DEFINE(HAVE_SOFTWARE_16_X11, 1, [Evas Software 16bit X11 Engine Support]) ],
+  [ dummy=no ],
+  [ #include <Evas.h> ]
+)
 CFLAGS=$PCFLAGS
 
 AC_PATH_XTRA
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 575e0ab..3b55390 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -14,6 +14,7 @@ main.c main.h \
 engine_software_x11.c engine_software_x11.h \
 engine_gl_x11.c engine_gl_x11.h \
 engine_xrender_x11.c engine_xrender_x11.h \
+engine_software_16_x11.c engine_software_16_x11.h \
 ui.c ui.h \
 about.c about.h \
 tests.h \
diff --git a/src/bin/main.c b/src/bin/main.c
index 96635fe..805a19f 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1097,6 +1097,8 @@ _engine_args(int argc, char **argv)
      loop_func = engine_gl_x11_loop;
    if (engine_xrender_x11_args(argc, argv))
      loop_func = engine_xrender_x11_loop;
+   if (engine_software_16_x11_args(argc, argv))
+     loop_func = engine_software_16_x11_loop;
    if (!loop_func)
      {
 	fprintf(stderr,
@@ -1106,7 +1108,7 @@ _engine_args(int argc, char **argv)
 		"  -e ENGINE\n"
 		"\n"
 		"Where ENGINE can be one of:\n"
-		"  x11 xr gl\n"
+		"  x11 xr gl x11-16\n"
 		);
 	exit(-1);
      }
diff --git a/src/bin/main.h b/src/bin/main.h
index 3a59cc6..0a03df6 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -13,6 +13,7 @@
 #include "engine_software_x11.h"
 #include "engine_gl_x11.h"
 #include "engine_xrender_x11.h"
+#include "engine_software_16_x11.h"
 #include "ui.h"
 #include "about.h"