diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index eaf4251da9..0be09abd2f 100644
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -184,6 +184,38 @@ AC_SUBST(COVERAGE_LIBS)
 
 AM_CONDITIONAL(EET_ENABLE_COVERAGE, test "x$enable_coverage" = "xyes")
 
+dnl Disable support for old eet file format.
+old_eet_file_format="yes"
+AC_ARG_ENABLE(old-eet-file-format,
+  AC_HELP_STRING(
+    [--disable-old-eet-file-format],
+    [disable old eet file format support. [[default=enabled]]]
+  ),
+  [ old_eet_file_format=$enableval ]
+)
+AM_CONDITIONAL(EET_OLD_EET_FILE_FORMAT, test "x$old_eet_file_format" = "xyes")
+if test "x$old_eet_file_format" = "xyes"; then
+  AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
+else
+  AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
+fi
+
+dnl Disable support for old eet file format.
+old_eet_file_format="yes"
+AC_ARG_ENABLE(old-eet-file-format,
+  AC_HELP_STRING(
+    [--disable-old-eet-file-format],
+    [disable old eet file format support. [[default=enabled]]]
+  ),
+  [ old_eet_file_format=$enableval ]
+)
+AM_CONDITIONAL(EET_OLD_EET_FILE_FORMAT, test "x$old_eet_file_format" = "xyes")
+if test "x$old_eet_file_format" = "xyes"; then
+  AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
+else
+  AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
+fi
+
 #AM_CHECK_DOXYGEN()
 
 AC_OUTPUT([
@@ -214,6 +246,10 @@ echo
 echo "  Tests................: ${enable_tests}"
 echo "  Coverage.............: ${enable_coverage}"
 echo
+echo "  Old eet file format..: ${old_eet_file_format}"
+echo
+echo "  Old eet file format..: ${old_eet_file_format}"
+echo
 echo "  Compilation..........: make"
 echo
 echo "  Installation.........: make install"
diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c
index e3647e2186..8e47693952 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/legacy/eet/src/lib/eet_lib.c
@@ -905,6 +905,7 @@ eet_internal_read2(Eet_File *ef)
    return ef;
 }
 
+#if EET_OLD_EET_FILE_FORMAT
 static Eet_File *
 eet_internal_read1(Eet_File *ef)
 {
@@ -915,6 +916,8 @@ eet_internal_read1(Eet_File *ef)
    int			 byte_entries;
    int			 i;
 
+   fprintf(stderr, "EET file format of '%s' is deprecated. You should just open it one time with mode == EET_FILE_MODE_READ_WRITE to solve this issue.\n", ef->path);
+
    /* build header table if read mode */
    /* geat header */
    index += sizeof(int);
@@ -1066,7 +1069,9 @@ eet_internal_read1(Eet_File *ef)
      }
    return ef;
 }
+#endif
 
+#if EET_OLD_EET_FILE_FORMAT
 static Eet_File *
 eet_internal_read(Eet_File *ef)
 {
@@ -1080,8 +1085,10 @@ eet_internal_read(Eet_File *ef)
 
    switch (ntohl(*data))
      {
+#if EET_OLD_EET_FILE_FORMAT
       case EET_MAGIC_FILE:
 	return eet_internal_read1(ef);
+#endif
       case EET_MAGIC_FILE2:
 	return eet_internal_read2(ef);
       default:
@@ -1271,6 +1278,7 @@ eet_open(const char *file, Eet_File_Mode mode)
 
    return ef;
 }
+#endif
 
 EAPI Eet_File_Mode
 eet_mode_get(Eet_File *ef)