Index: src/lib/elm_widget_naviframe.h
===================================================================
--- src/lib/elm_widget_naviframe.h	(revision 76593)
+++ src/lib/elm_widget_naviframe.h	(working copy)
@@ -125,6 +125,7 @@ struct _Elm_Naviframe_Smart_Data
 
    Eina_Inlist          *stack; /* top item is the list's LAST item */
    Evas_Object          *dummy_edje;
+   Ecore_Animator       *animator;
 
    Eina_Bool             preserve : 1;
    Eina_Bool             on_deletion : 1;
Index: src/lib/elc_naviframe.c
===================================================================
--- src/lib/elc_naviframe.c	(revision 76593)
+++ src/lib/elc_naviframe.c	(working copy)
@@ -1104,6 +1104,8 @@ _elm_naviframe_smart_del(Evas_Object *obj)
 
    evas_object_del(sd->dummy_edje);
 
+   if (sd->animator) ecore_animator_del(sd->animator);
+
    ELM_WIDGET_CLASS(_elm_naviframe_parent_sc)->base.del(obj);
 }
 
@@ -1126,6 +1128,50 @@ _elm_naviframe_smart_set_user(Elm_Naviframe_Smart_
    ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_naviframe_smart_sizing_eval;
 }
 
+static Eina_Bool
+_push_transition_cb(void *data)
+{
+   Elm_Naviframe_Item *prev_it, *it;
+   ELM_NAVIFRAME_DATA_GET(data, sd);
+
+   it = (Elm_Naviframe_Item *) elm_naviframe_top_item_get(data);
+
+   if (sd->stack->last->prev)
+     {
+        prev_it = EINA_INLIST_CONTAINER_GET(sd->stack->last->prev,
+                                            Elm_Naviframe_Item);
+        edje_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed,deferred", "elm");
+        edje_object_message_signal_process(VIEW(prev_it));
+     }
+   edje_object_signal_emit(VIEW(it), "elm,state,new,pushed,deferred", "elm");
+   edje_object_message_signal_process(VIEW(it));
+
+   sd->animator = NULL;
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_pop_transition_cb(void *data)
+{
+   Elm_Naviframe_Item *prev_it, *it;
+   it = (Elm_Naviframe_Item *)data;
+   if (!it) return ECORE_CALLBACK_CANCEL;
+   ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd);
+
+   prev_it = (Elm_Naviframe_Item *) elm_naviframe_top_item_get(WIDGET(it));
+   if (prev_it)
+     {
+        edje_object_signal_emit(VIEW(prev_it), "elm,state,prev,popped,deferred", "elm");
+        edje_object_message_signal_process(VIEW(prev_it));
+     }
+   edje_object_signal_emit(VIEW(it), "elm,state,cur,popped,deferred", "elm");
+
+   edje_object_message_signal_process(VIEW(it));
+
+   sd->animator = NULL;
+   return ECORE_CALLBACK_CANCEL;
+}
+
 EAPI const Elm_Naviframe_Smart_Class *
 elm_naviframe_smart_class_get(void)
 {
@@ -1208,6 +1254,9 @@ elm_naviframe_item_push(Evas_Object *obj,
 
         /* animate new one */
         edje_object_message_signal_process(VIEW(it));
+
+        if (sd->animator) ecore_animator_del(sd->animator);
+        sd->animator = ecore_animator_add(_push_transition_cb, obj);
      }
 
    sd->stack = eina_inlist_append(sd->stack, EINA_INLIST_GET(it));
@@ -1347,6 +1396,9 @@ elm_naviframe_item_pop(Evas_Object *obj)
 
         edje_object_message_signal_process(VIEW(it));
         edje_object_message_signal_process(VIEW(prev_it));
+
+        if (sd->animator) ecore_animator_del(sd->animator);
+        sd->animator = ecore_animator_add(_pop_transition_cb, it);
      }
    else
      elm_widget_item_del(it);
@@ -1438,6 +1490,8 @@ elm_naviframe_item_promote(Elm_Object_Item *it)
 
    edje_object_message_signal_process(VIEW(prev_it));
    edje_object_message_signal_process(VIEW(nit));
+   if (sd->animator) ecore_animator_del(sd->animator);
+   sd->animator = ecore_animator_add(_push_transition_cb, nit->base.widget);
 }
 
 EAPI void