diff --git a/ChangeLog b/ChangeLog
index 5bd17e3dd..b6160d222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-17  Matthew Allum  <mallum@openedhand.com>
+
+	* configure.ac:
+	Fix CLUTTER_NO_FPU typo.
+
 2007-05-17  Tomas Frydrych  <tf@openedhand.com>
 	
 	* clutter/clutter-alpha.h:
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index a1d8d4c48..7533c1497 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -68,7 +68,11 @@ typedef enum {
 
   CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0,
   CLUTTER_ACTOR_IS_TOPLEVEL    = 1 << 1,
-  CLUTTER_ACTOR_IN_REPARENT    = 1 << 2
+  CLUTTER_ACTOR_IN_REPARENT    = 1 << 2,
+  CLUTTER_ACTOR_SYNC_MATRICES  = 1 << 3 /* Used by stage to indicate GL
+					 * viewport / perspective etc
+					 * needs (re)setting. 
+					*/
 } ClutterPrivateFlags;
 
 #define CLUTTER_PRIVATE_FLAGS(a)	 (CLUTTER_ACTOR ((a))->private_flags)
diff --git a/clutter/glx/clutter-stage-glx.c b/clutter/glx/clutter-stage-glx.c
index c00de086c..4f992b466 100644
--- a/clutter/glx/clutter-stage-glx.c
+++ b/clutter/glx/clutter-stage-glx.c
@@ -313,17 +313,29 @@ clutter_stage_glx_paint (ClutterActor *self)
 
   CLUTTER_NOTE (PAINT, " Redraw enter");
 
+  /* Setup FPS count */
   if (clutter_get_show_fps ())
     {
       if (!timer)
 	timer = g_timer_new ();
     }
 
-  clutter_stage_get_color (stage, &stage_color);
+  /* Reset view matrices if needed. */
+  if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_SYNC_MATRICES)
+    {
+      /* 
+	 cogl_set_view_matrix (view_width, 
+	                       view_height, 
+			       perspective)
+			       
+      */
+    }
 
+  /* Setup the initial paint */
+  clutter_stage_get_color (stage, &stage_color);
   cogl_paint_init (&stage_color);
 
-  /* chain up to reach ClutterGroup->paint here */
+  /* chain up to reach ClutterGroup->paint here and actually paint all */
   CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint (self);
 
   /* Why this paint is done in backend as likely GL windowing system
@@ -340,6 +352,7 @@ clutter_stage_glx_paint (ClutterActor *self)
       CLUTTER_GLERR ();
     }
 
+  /* Complete FPS info */
   if (clutter_get_show_fps ())
     {
       timer_n_frames++;
diff --git a/configure.ac b/configure.ac
index 4dea30363..168d8b8a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,7 +252,7 @@ if test "x$with_fpu" != "xyes" ; then
    CLUTTER_FIXED_CFLAGS="-DCFX_NO_FPU"
 fi
 
-AC_SUBST(CLUTTER_HAS_FPU)
+AC_SUBST(CLUTTER_NO_FPU)
 
 dnl = GTK Doc check ========================================================