diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 35694e48d5..9c2da2bf1f 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -431,3 +431,8 @@
 
 	* The state of elm_check is now changed by mouse click event.
 
+2012-09-03  Rajeev Ranjan
+
+        * Fix min/max limit setting to respect field boundaires EXCEPT
+        for years which have no boundaries with
+        elm_datetime_field_limit_set()
diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c
index ee3f252356..edfd99dc69 100644
--- a/legacy/elementary/src/lib/elm_datetime.c
+++ b/legacy/elementary/src/lib/elm_datetime.c
@@ -934,11 +934,13 @@ elm_datetime_field_limit_set(Evas_Object *obj,
    if (min > max) return;
 
    field = sd->field_list + fieldtype;
-   if ((min > mapping[fieldtype].def_min && min < mapping[fieldtype].def_max)
-       || (field->type == ELM_DATETIME_YEAR))
+   if (((min >= mapping[fieldtype].def_min) && 
+        (min <= mapping[fieldtype].def_max)) ||
+       (field->type == ELM_DATETIME_YEAR))
      field->min = min;
-   if ((max > mapping[fieldtype].def_min && max < mapping[fieldtype].def_max)
-       || (field->type == ELM_DATETIME_YEAR))
+   if (((max >= mapping[fieldtype].def_min) && 
+        (max <= mapping[fieldtype].def_max)) ||
+       (field->type == ELM_DATETIME_YEAR))
      field->max = max;
 
    _apply_field_limits(obj);