diff --git a/configure.ac b/configure.ac
index 9684274083..a35930a34c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -995,6 +995,40 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
 EFL_LIB_END([Eo])
 #### End of Eo
 
+#### Eolian
+
+EFL_LIB_START([Eolian])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EOLIAN], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EOLIAN], [eina])
+EFL_INTERNAL_DEPEND_PKG([EOLIAN], [ecore-file])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([Eolian])
+#### End of Eolian
+
 
 #### Evas
 
@@ -3981,6 +4015,7 @@ pc/eina.pc
 pc/eina-cxx.pc
 pc/eet.pc
 pc/eo.pc
+pc/eolian.pc
 pc/evas-fb.pc
 pc/evas-opengl-x11.pc
 pc/evas-opengl-sdl.pc
@@ -4117,6 +4152,7 @@ if test "x${have_pixman}" = "xyes" ; then
 echo "  Pixman........: ${features_evas_pixman}"
 fi
 echo "Eo..............: yes (${features_eo})"
+echo "Eolian..........: yes (${features_eolian})"
 echo "Eina............: yes (${features_eina})"
 echo "Ecore...........: yes (${features_ecore})"
 echo "Ecore_Con.......: yes (${features_ecore_con})"
diff --git a/src/Makefile.am b/src/Makefile.am
index b2ac30d76a..20b5384712 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,7 @@ include Makefile_Escape.am
 include Makefile_Eina.am
 include Makefile_Eo.am
 include Makefile_Eet.am
+include Makefile_Eolian.am
 include Makefile_Evas.am
 include Makefile_Ecore.am
 include Makefile_Ecore_Cxx.am
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
new file mode 100644
index 0000000000..c47ba1afc8
--- /dev/null
+++ b/src/Makefile_Eolian.am
@@ -0,0 +1,40 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/eolian/libeolian.la
+
+installed_eolianmainheadersdir = $(includedir)/eolian-@VMAJ@
+dist_installed_eolianmainheaders_DATA = lib/eolian/Eolian.h
+
+lib_eolian_libeolian_la_SOURCES = \
+                                  lib/eolian/eo_definitions.c \
+                                  lib/eolian/eo_definitions.h \
+                                  lib/eolian/eo_lexer.c \
+                                  lib/eolian/eo_lexer.h \
+                                  lib/eolian/eolian.c \
+                                  lib/eolian/eolian_database.c \
+                                  lib/eolian/eolian_database.h
+
+lib_eolian_libeolian_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
+lib_eolian_libeolian_la_LIBADD = @EOLIAN_LIBS@
+lib_eolian_libeolian_la_DEPENDENCIES = @EOLIAN_INTERNAL_LIBS@
+lib_eolian_libeolian_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+bin_PROGRAMS += \
+                bin/eolian/eolian
+
+bin_eolian_eolian_SOURCES = \
+                bin/eolian/common_funcs.c \
+                bin/eolian/common_funcs.h \
+                bin/eolian/eo1_generator.c \
+                bin/eolian/eo1_generator.h \
+                bin/eolian/legacy_generator.c \
+                bin/eolian/legacy_generator.h \
+                bin/eolian/main.c
+
+bin_eolian_eolian_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
+bin_eolian_eolian_LDADD = @USE_EOLIAN_LIBS@
+bin_eolian_eolian_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+
+
+EXTRA_DIST += bin/eolian/eo_lexer.rl