diff --git a/data/Makefile.am b/data/Makefile.am
index e3dc4c262c..f2d475397a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,4 +6,7 @@ embryofiles_DATA = embryo/default.inc
 evasfilesdir = $(datadir)/evas
 evasfiles_DATA = evas/checkme
 
-EXTRA_DIST = embryo/default.inc evas/checkme
+eofilesdir = $(datadir)/eo
+eofiles_DATA = eo/eo_step.py
+
+EXTRA_DIST = embryo/default.inc evas/checkme eo/eo_step.py
diff --git a/data/eo/eo_step.py b/data/eo/eo_step.py
new file mode 100644
index 0000000000..54dd998648
--- /dev/null
+++ b/data/eo/eo_step.py
@@ -0,0 +1,17 @@
+class Eo_step(gdb.Command):
+   def __init__(self):
+      gdb.Command.__init__(self, "eo_step", gdb.COMMAND_OBSCURE)
+
+   def invoke (self, arg, from_tty):
+      # While libeo is not reached, we step into
+      while gdb.solib_name(gdb.selected_frame().pc()).find("libeo.so") == -1:
+         # step by one assembly instruction, no print
+         gdb.execute("stepi", False, to_string=True)
+
+      # While we are in libeo or in an unknown function, we step into
+      while (gdb.selected_frame().function() == None) or (gdb.solib_name(gdb.selected_frame().pc()).find("libeo.so") != -1):
+         # step by one assembly instruction, no print
+         gdb.execute("stepi", False, to_string=True)
+
+      print "Stopped at file " + gdb.selected_frame().find_sal().symtab.filename+ " line " + str(gdb.selected_frame().find_sal().line) + " function " + str(gdb.selected_frame().function())
+Eo_step()