diff --git a/ChangeLog b/ChangeLog
index c593a9053b..87e85b0974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-12  Daniel Willmann
+
+	* Fix possible buffer overflow in functions relying on EET_T_LAST.
+
 2012-12-12  Cedric Bail
 
 	* Add ellipsis support in Evas_Object_Text.
diff --git a/NEWS b/NEWS
index d3122b07a0..4620111b41 100644
--- a/NEWS
+++ b/NEWS
@@ -76,3 +76,4 @@ Fixes:
     * Fixed polygon rendering bug in GL backend when there are cutouts.
     * Fix leak in eet_pbkdf2_sha1 with OpenSSL.
     * Fix the gl line incorrect position drawing.
+    * Fix possible buffer overflow in functions relying on EET_T_LAST
diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h
index b794ad1d86..91fcb4c277 100644
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@@ -2401,7 +2401,7 @@ eet_identity_certificate_print(const unsigned char *certificate,
 #define EET_T_F32P32         14 /**< Data type: fixed point 32.32 */
 #define EET_T_F16P16         15 /**< Data type: fixed point 16.16 */
 #define EET_T_F8P24          16 /**< Data type: fixed point 8.24 */
-#define EET_T_LAST           18 /**< Last data type */
+#define EET_T_LAST           17 /**< Last data type */
 
 #define EET_G_UNKNOWN        100 /**< Unknown group data encoding type */
 #define EET_G_ARRAY          101 /**< Fixed size array group type */