diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index d05ddcfc36..236341e250 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/Makefile.am
@@ -93,8 +93,6 @@ ecore-input.pc.in \
 ecore-wince.pc.in \
 ecore.spec.in \
 ecore.spec \
-examples/ecore_con_server_example.c \
-examples/ecore_con_client_example.c \
 m4/ac_abstract_socket.m4 \
 m4/ac_attribute.m4 \
 m4/check_x_extension.m4 \
diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index 74dc0ecad7..853bdad31c 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -1378,6 +1378,11 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince],
    [${have_ecore_wince}],
    [requirements_ecore_evas="ecore-wince >= 1.0.0 ${requirements_ecore_evas}"])
 
+### install and build examples
+
+EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
+EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
+
 ### requirements
 
 AC_SUBST(requirements_ecore)
@@ -1442,6 +1447,7 @@ src/lib/ecore_wince/Makefile
 src/lib/ecore_x/Makefile
 src/lib/ecore_x/xlib/Makefile
 src/lib/ecore_x/xcb/Makefile
+src/examples/Makefile
 src/tests/Makefile
 README
 ecore.spec
diff --git a/legacy/ecore/doc/Doxyfile.in b/legacy/ecore/doc/Doxyfile.in
index 79d731ac96..800c4bbc2f 100644
--- a/legacy/ecore/doc/Doxyfile.in
+++ b/legacy/ecore/doc/Doxyfile.in
@@ -82,7 +82,7 @@ EXCLUDE                = @top_srcdir@/src/lib/ecore_config/* @top_srcdir@/src/li
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = ecore_config* Ecore_Config*
 EXCLUDE_SYMBOLS        = Ecore_Config*
-EXAMPLE_PATH           = @top_srcdir@/examples/
+EXAMPLE_PATH           = @top_srcdir@/src/examples/
 EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = YES
 IMAGE_PATH             = img
diff --git a/legacy/ecore/m4/efl_examples.m4 b/legacy/ecore/m4/efl_examples.m4
new file mode 100644
index 0000000000..2a809adff5
--- /dev/null
+++ b/legacy/ecore/m4/efl_examples.m4
@@ -0,0 +1,63 @@
+dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
+dnl That code is public domain and can be freely used or copied.
+
+dnl Macro that check if building examples is wanted.
+
+dnl Usage: EFL_CHECK_BUILD_EXAMPLES([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Defines the automake conditionnal EFL_ENABLE_BUILD_EXAMPLES
+
+AC_DEFUN([EFL_CHECK_BUILD_EXAMPLES],
+[
+
+dnl configure option
+
+AC_ARG_ENABLE([build-examples],
+   [AC_HELP_STRING([--enable-build-examples], [enable building examples @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       _efl_enable_build_examples="yes"
+    else
+       _efl_enable_build_examples="no"
+    fi
+   ],
+   [_efl_enable_build_examples="no"])
+
+AC_MSG_CHECKING([whether examples are built])
+AC_MSG_RESULT([${_efl_enable_build_examples}])
+
+AM_CONDITIONAL(EFL_BUILD_EXAMPLES, test "x${_efl_enable_build_examples}" = "xyes")
+
+AS_IF([test "x$_efl_enable_build_examples" = "xyes"], [$1], [$2])
+])
+
+
+dnl Macro that check if installing examples is wanted.
+
+dnl Usage: EFL_CHECK_INSTALL_EXAMPLES([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Defines the automake conditionnal EFL_ENABLE_INSTALL_EXAMPLES
+
+AC_DEFUN([EFL_CHECK_INSTALL_EXAMPLES],
+[
+
+dnl configure option
+
+AC_ARG_ENABLE([install-examples],
+   [AC_HELP_STRING([--enable-install-examples], [enable installing example source files @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       _efl_enable_install_examples="yes"
+    else
+       _efl_enable_install_examples="no"
+    fi
+   ],
+   [_efl_enable_install_examples="no"])
+
+AC_MSG_CHECKING([whether examples are installed])
+AC_MSG_RESULT([${_efl_enable_install_examples}])
+
+AM_CONDITIONAL(EFL_INSTALL_EXAMPLES, test "x${_efl_enable_install_examples}" = "xyes")
+
+AS_IF([test "x$_efl_enable_install_examples" = "xyes"], [$1], [$2])
+])
+
+dnl End of efl_examples.m4
diff --git a/legacy/ecore/src/Makefile.am b/legacy/ecore/src/Makefile.am
index a6fc38fef0..d98d3b61d2 100644
--- a/legacy/ecore/src/Makefile.am
+++ b/legacy/ecore/src/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib bin tests
+SUBDIRS = lib bin tests examples
diff --git a/legacy/ecore/src/examples/Makefile.am b/legacy/ecore/src/examples/Makefile.am
new file mode 100644
index 0000000000..ea1964e73d
--- /dev/null
+++ b/legacy/ecore/src/examples/Makefile.am
@@ -0,0 +1,34 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+pkglibdir = $(datadir)/$(PACKAGE)/examples
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib/ecore \
+@GLIB_CFLAGS@ @EVIL_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@
+
+LDADD = \
+	$(top_builddir)/src/lib/ecore/libecore.la \
+	@dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
+
+SRCS = \
+	client_bench.c \
+	server_bench.c \
+	ecore_con_client_example.c \
+	ecore_con_server_example.c \
+	ecore_fd_handler_example.c \
+	ecore_file_download_example.c
+
+EXTRA_DIST = $(SRCS)
+
+pkglib_PROGRAMS =
+
+if EFL_INSTALL_EXAMPLES
+filesdir = $(datadir)/$(PACKAGE)/examples
+files_DATA = $(SRCS)
+endif
+
+if EFL_BUILD_EXAMPLES
+pkglib_PROGRAMS +=
+endif
+
diff --git a/legacy/ecore/examples/client_bench.c b/legacy/ecore/src/examples/client_bench.c
similarity index 100%
rename from legacy/ecore/examples/client_bench.c
rename to legacy/ecore/src/examples/client_bench.c
diff --git a/legacy/ecore/examples/ecore_con_client_example.c b/legacy/ecore/src/examples/ecore_con_client_example.c
similarity index 100%
rename from legacy/ecore/examples/ecore_con_client_example.c
rename to legacy/ecore/src/examples/ecore_con_client_example.c
diff --git a/legacy/ecore/examples/ecore_con_server_example.c b/legacy/ecore/src/examples/ecore_con_server_example.c
similarity index 100%
rename from legacy/ecore/examples/ecore_con_server_example.c
rename to legacy/ecore/src/examples/ecore_con_server_example.c
diff --git a/legacy/ecore/examples/ecore_fd_handler_example.c b/legacy/ecore/src/examples/ecore_fd_handler_example.c
similarity index 100%
rename from legacy/ecore/examples/ecore_fd_handler_example.c
rename to legacy/ecore/src/examples/ecore_fd_handler_example.c
diff --git a/legacy/ecore/examples/ecore_file_download_example.c b/legacy/ecore/src/examples/ecore_file_download_example.c
similarity index 100%
rename from legacy/ecore/examples/ecore_file_download_example.c
rename to legacy/ecore/src/examples/ecore_file_download_example.c
diff --git a/legacy/ecore/examples/server_bench.c b/legacy/ecore/src/examples/server_bench.c
similarity index 100%
rename from legacy/ecore/examples/server_bench.c
rename to legacy/ecore/src/examples/server_bench.c