diff --git a/ChangeLog b/ChangeLog
index 065cadfad..f8bfff86d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-21  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* examples/video-cube.c (main): Quit on key press.
+
 2006-06-21  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/Makefile.am: Re-fix distcheck after last commit.
diff --git a/doc/reference/tmpl/clutter-main.sgml b/doc/reference/tmpl/clutter-main.sgml
index 14db54456..0edbb6c09 100644
--- a/doc/reference/tmpl/clutter-main.sgml
+++ b/doc/reference/tmpl/clutter-main.sgml
@@ -45,6 +45,7 @@ clutter-main
 @a...:
 @a...:
 @a...:
+@a...:
 @a...: 
 
 
diff --git a/examples/video-cube.c b/examples/video-cube.c
index 9aa95b243..336fea0e6 100644
--- a/examples/video-cube.c
+++ b/examples/video-cube.c
@@ -238,6 +238,8 @@ main (int argc, char *argv[])
   clutter_init (&argc, &argv);
 
   stage = clutter_stage_get_default ();
+  g_signal_connect (stage, "key-press-event",
+		    G_CALLBACK (clutter_main_quit), NULL);
 
   pixbuf = gdk_pixbuf_new_from_file ("clutter-logo-800x600.png", NULL);