diff --git a/configure.ac b/configure.ac
index 241b69e607..6c1014482a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4123,6 +4123,7 @@ src/examples/eet/Makefile
 src/examples/eo/Makefile
 src/examples/evas/Makefile
 src/examples/ecore/Makefile
+src/examples/eio/Makefile
 src/lib/eina/eina_config.h
 spec/efl.spec
 pc/evil.pc
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index adcc5ebdc6..97748f83ec 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -34,6 +34,7 @@ lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
 @ECORE_FB_CFLAGS@
 
 lib_ecore_fb_libecore_fb_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
 lib/ecore/libecore.la \
 lib/eo/libeo.la \
 lib/eina/libeina.la \
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 020393036c..da0ba7df1b 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = eina eo eet evas ecore
+SUBDIRS = eina eo eet evas ecore eio
 
 examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
@@ -8,6 +8,7 @@ examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C evas examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C ecore examples
+	@$(MAKE) $(AM_MAKEFLAGS) -C eio examples
 
 install-examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
@@ -15,3 +16,4 @@ install-examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C evas install-examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples
+	@$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples
diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am
new file mode 100644
index 0000000000..bd34825f7c
--- /dev/null
+++ b/src/examples/eio/Makefile.am
@@ -0,0 +1,40 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/eio \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/eio
+
+EXTRA_PROGRAMS = eio_file_ls
+
+eio_file_ls_SOURCES = eio_file_ls.c
+eio_file_ls_LDADD = \
+$(top_builddir)/src/lib/eio/libeio.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/eina/libeina.la \
+@EIO_LIBS@
+
+SRCS = \
+eio_file_ls
+
+examples: $(EXTRA_PROGRAMS)
+
+clean-local:
+	rm -f $(EXTRA_PROGRAMS)
+
+install-examples:
+	mkdir -p $(datadir)/eio/examples
+	$(install_sh_DATA) -c $(SRCS) $(datadir)/eio/examples
+
+uninstall-local:
+	for f in $(SRCS) ; do \
+	  rm -f $(datadir)/io/examples/$$f ; \
+	done
diff --git a/legacy/eio/src/examples/eio_file_ls.c b/src/examples/eio/eio_file_ls.c
similarity index 100%
rename from legacy/eio/src/examples/eio_file_ls.c
rename to src/examples/eio/eio_file_ls.c