diff --git a/src/Makefile_Eolian_Files_Helper.am b/src/Makefile_Eolian_Files_Helper.am
index 1260d718c5..bf14567554 100644
--- a/src/Makefile_Eolian_Files_Helper.am
+++ b/src/Makefile_Eolian_Files_Helper.am
@@ -8,19 +8,19 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h
 %.eo.c: %.eo ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:$@ $<
 
 %.eo.h: %.eo ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $<
 
 %.eot.h: %.eot ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $<
 
 %.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gl -o l:$@ $<
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index ddf09e54a4..1b013ab181 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -2,8 +2,8 @@ if HAVE_EOLIAN_GEN
 EOLIAN_GEN = @eolian_gen@
 _EOLIAN_GEN_DEP = @eolian_gen@
 else
-EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
-_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
+EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian2/eolian_gen2${EXEEXT}
+_EOLIAN_GEN_DEP = bin/eolian2/eolian_gen2${EXEEXT}
 endif
 
 include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
diff --git a/src/bin/eolian2/main.c b/src/bin/eolian2/main.c
index a1cda50c1b..4452660b65 100644
--- a/src/bin/eolian2/main.c
+++ b/src/bin/eolian2/main.c
@@ -110,8 +110,8 @@ static void _fill_all_outs(char **outs, const char *val)
 static Eina_Strbuf *
 _include_guard(const char *fname, const char *gname, Eina_Strbuf *buf)
 {
-   if (!buf || !eina_strbuf_length_get(buf))
-     return buf;
+   if (!buf)
+     return NULL;
 
    if (!gname)
      gname = "";
@@ -454,7 +454,7 @@ main(int argc, char **argv)
      }
 
    const char *ext = strrchr(input, '.');
-   if (!ext || strcmp(ext, ".eo"))
+   if (!ext || (strcmp(ext, ".eo") && strcmp(ext, ".eot")))
      {
         fprintf(stderr, "eolian: invalid input file '%s'\n", input);
         goto end;