diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index c221b0a9db..1bc3144f79 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/Makefile.am
@@ -30,8 +30,8 @@ dist-hook:
 
 bin_SCRIPTS = ecore-config
 
-EXTRA_DIST = README AUTHORS COPYING ecore.m4 ecore.spec ecore.c.in gendoc Doxyfile ecore_docs.tar.gz \
-make_cross_compile_arm.sh conf-e-x11.sh
+EXTRA_DIST = README AUTHORS COPYING ecore.m4 ecore.spec ecore.c.in gendoc \
+Doxyfile ecore_docs.tar.gz make_cross_compile_arm.sh
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ecore.m4
diff --git a/legacy/ecore/gendoc b/legacy/ecore/gendoc
index 1fb62cc3c8..cf0576d5b2 100755
--- a/legacy/ecore/gendoc
+++ b/legacy/ecore/gendoc
@@ -9,4 +9,7 @@ done
 rm -rf ./doc/html ./doc/latex ./doc/man
 doxygen
 cp doc/img/*.png doc/html/
+rm -f ecore_docs.tar ecore_docs.tar.gz
+tar -cvf ecore_docs.tar doc/html doc/man doc/latex
+gzip -9 ecore_docs.tar
 exit 0
diff --git a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c
index eb40aff0fe..f4dd5be656 100644
--- a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c
+++ b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c
@@ -30,7 +30,7 @@ ecore_txt_convert(char *enc_from, char *enc_to, char *text)
    for (;;)
      {
 	size_t count;
-	
+
 	tob = outb;
 	count = iconv(ic, &inp, &inb, &outp, &outb);
 	outlen += tob - outb;
@@ -42,6 +42,18 @@ ecore_txt_convert(char *enc_from, char *enc_to, char *text)
 		  outalloc += 64;
 		  outb += 64;
 	       }
+	     else if (errno == EILSEQ)
+	       {
+		  if (new_txt) free(new_txt);
+		  new_txt = NULL;
+		  break;
+	       }
+	     else if (errno == EINVAL)
+	       {
+		  if (new_txt) free(new_txt);
+		  new_txt = NULL;
+		  break;
+	       }
 	  }
 	if (inb == 0)
 	  {