diff --git a/configure.ac b/configure.ac
index d0b9962823..61d3c9d7f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5760,6 +5760,7 @@ src/lib/eina/eina_config.h
 src/lib/ecore_x/ecore_x_version.h
 src/lib/efl/Efl_Config.h
 src/lib/elementary/Elementary.h
+src/scripts/eo/eo_debug
 elm_intro.h
 spec/efl.spec
 pc/evil.pc
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 80460ef791..eefa6119f8 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -14,7 +14,8 @@ BUILT_SOURCES += \
                  $(eo_eolian_c) \
                  $(eo_eolian_h)
 
-lib_LTLIBRARIES += lib/eo/libeo.la
+lib_LTLIBRARIES += lib/eo/libeo.la \
+                   lib/eo/libeo_dbg.la
 
 installed_eomainheadersdir = $(includedir)/eo-@VMAJ@
 dist_installed_eomainheaders_DATA = lib/eo/Eo.h lib/eo/efl_future.h
@@ -38,6 +39,17 @@ lib_eo_libeo_la_LIBADD = @EO_LIBS@
 lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
 lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
+### The Eo debug build
+lib_eo_libeo_dbg_la_SOURCES = $(lib_eo_libeo_la_SOURCES)
+lib_eo_libeo_dbg_la_CPPFLAGS = $(lib_eo_libeo_la_CPPFLAGS) -DEO_DEBUG
+lib_eo_libeo_dbg_la_LIBADD = $(lib_eo_libeo_la_LIBADD)
+lib_eo_libeo_dbg_la_DEPENDENCIES = $(lib_eo_libeo_la_DEPENDENCIES)
+lib_eo_libeo_dbg_la_LDFLAGS = $(lib_eo_libeo_la_LDFLAGS)
+
+bin_SCRIPTS += scripts/eo/eo_debug
+
+######
+
 eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
 eoeolianfiles_DATA = \
 					 $(eo_eolian_files) \
diff --git a/src/scripts/eo/eo_debug.in b/src/scripts/eo/eo_debug.in
new file mode 100644
index 0000000000..a289efa6ad
--- /dev/null
+++ b/src/scripts/eo/eo_debug.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+if [ $# -lt 1 ]
+then
+   echo "Usage: $0 <executable> [executable parameters]"
+else
+   LD_PRELOAD="@libdir@/libeo_dbg.so" "$@"
+fi