diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index a419497640..8690432995 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -389,3 +389,10 @@
 
 	* Patch in incomplte access support in datetime.
 
+2012-08-21  Carsten Haitzler (The Rasterman)
+
+	* Spotted an incompleteness. there is a way to set Elm_Win_Trap for
+          manual render, but no way to go to an elm win and do this (And
+          of course twiddle with the norender state too), so add this in.
+          elm_win_norender_push(), elm_win_norender_pop(),
+          elm_win_norender_get() and elm_win_render() added.
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index a8c3f5084a..b5aada81b8 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -131,6 +131,7 @@ struct _Elm_Win_Smart_Data
    double       aspect;
    int          size_base_w, size_base_h;
    int          size_step_w, size_step_h;
+   int          norender;
    Eina_Bool    urgent : 1;
    Eina_Bool    modal : 1;
    Eina_Bool    demand_attention : 1;
@@ -3260,6 +3261,43 @@ elm_win_layer_get(const Evas_Object *obj)
    return ecore_evas_layer_get(sd->ee);
 }
 
+EAPI void
+elm_win_norender_push(Evas_Object *obj)
+{
+   ELM_WIN_CHECK(obj);
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
+   
+   sd->norender++;
+   if (sd->norender == 1) ecore_evas_manual_render_set(sd->ee, EINA_TRUE);
+}
+
+EAPI void
+elm_win_norender_pop(Evas_Object *obj)
+{
+   ELM_WIN_CHECK(obj);
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
+
+   if (sd->norender <= 0) return;
+   sd->norender--;
+   if (sd->norender == 0) ecore_evas_manual_render_set(sd->ee, EINA_FALSE);
+}
+
+EAPI int
+elm_win_norender_get(Evas_Object *obj)
+{
+   ELM_WIN_CHECK(obj) - 1;
+   ELM_WIN_DATA_GET_OR_RETURN_VAL(obj, sd, -1);
+   return sd->norender;
+}
+
+EAPI void
+elm_win_render(Evas_Object *obj)
+{
+   ELM_WIN_CHECK(obj);
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
+   ecore_evas_manual_render(sd->ee);
+}
+
 EAPI void
 elm_win_rotation_set(Evas_Object *obj,
                      int rotation)
diff --git a/legacy/elementary/src/lib/elm_win.h b/legacy/elementary/src/lib/elm_win.h
index 06a6a5ef26..66566e52bc 100644
--- a/legacy/elementary/src/lib/elm_win.h
+++ b/legacy/elementary/src/lib/elm_win.h
@@ -877,6 +877,80 @@ EAPI void                  elm_win_layer_set(Evas_Object *obj, int layer);
  */
 EAPI int                   elm_win_layer_get(const Evas_Object *obj);
 
+/**
+ * This pushes (incriments) the norender counter on the window
+ * 
+ * @param obj The window object
+ * 
+ * There are some occasions where you wish to suspend rendering on a window.
+ * You may be "sleeping" and have nothing to update and do not want animations
+ * or other theme side-effects causing rendering to the window while "asleep".
+ * You can push (and pop) the norender mode to have this work.
+ * 
+ * If combined with evas_render_dump(), evas_image_cache_flush() and
+ * evas_font_cache_flush() (and maybe edje_file_cache_flush() and 
+ * edje_collection_cache_flush()), you can minimize memory footprint
+ * significantly while "asleep", and the pausing of rendering ensures
+ * evas does not re-load data into memory until needed. When rendering is
+ * resumed, data will be re-loaded as needed, which may result in some
+ * lag, but does save memory.
+ * 
+ * @see elm_win_norender_pop()
+ * @see elm_win_norender_get()
+ * @see elm_win_render()
+ * @ingroup Win
+ * @since 1.7
+ */
+EAPI void                  elm_win_norender_push(Evas_Object *obj);
+
+/**
+ * This pops (decrements) the norender counter on the window
+ * 
+ * @param obj The window object
+ * 
+ * Once norender has gone back to 0, then automatic rendering will continue
+ * in the given window. If it is already at 0, this will have no effect.
+ * 
+ * @see elm_win_norender_push()
+ * @see elm_win_norender_get()
+ * @see elm_win_render()
+ * @ingroup Win
+ * @since 1.7
+ */
+EAPI void                  elm_win_norender_pop(Evas_Object *obj);
+
+/**
+ * The retruns how many times norender has been pushed on the window
+ * @param obj The window object
+ * @return The number of times norender has been pushed
+ * 
+ * @see elm_win_norender_push()
+ * @see elm_win_norender_pop()
+ * @see elm_win_render()
+ * @ingroup Win
+ * @since 1.7
+ */
+EAPI int                   elm_win_norender_get(Evas_Object *obj);
+
+/**
+ * This manually asks evas to render the window now
+ * 
+ * @param obj The window object
+ * 
+ * You should NEVER call this unless you really know what you are doing and
+ * why. Never call this unless you are asking for performance degredation
+ * and possibly weird behavior. Windows get automatically rendered when the
+ * application goes idle so there is never a need to call this UNLESS you
+ * have enabled "norender" mode.
+ * 
+ * @see elm_win_norender_push()
+ * @see elm_win_norender_pop()
+ * @see elm_win_norender_get()
+ * @ingroup Win
+ * @since 1.7
+ */
+EAPI void                  elm_win_render(Evas_Object *obj);
+
 /**
  * Set the rotation of the window.
  *