diff --git a/ChangeLog b/ChangeLog
index 9dc2bf7e4d..c30ea5f3a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -306,3 +306,7 @@
 
         * Fix EINA_INLIST_FOREACH_SAFE macro to work when inlist is not the
         first item in the struct.
+
+2013-01-15  ChunEon Park (Hermet) <hermet@hermet.pe.kr>
+
+        * Fix SIGFPE in evas map update if image size is 0.
diff --git a/NEWS b/NEWS
index 4658915137..25ad7fe659 100644
--- a/NEWS
+++ b/NEWS
@@ -112,3 +112,4 @@ Fixes:
     * Fix endianess issue in Eet_Image.
     * Fix bug in eio_file_map_new container set.
     * Evas textblock: Fixed issue with line height when breaking on a format.
+    * Fix SIGFPE in evas map update if image is 0.