diff --git a/ChangeLog b/ChangeLog
index a229cd5acd..2d8d778fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-11  Carlos Garnacho  <carlos@imendio.com>D:ChangeLog
+
+	* gtk/gtkassistant.c (gtk_assistant_set_current_page): Add current
+	page to visited page list instead of next current page. (#527466,
+	patch by Marcus Brinkmann)
+
 2008-04-11  Tristan Van Berkom <tvb@gnome.org>
 
 	* gtk/gtklabel.c: Added <attributes> / <attribute>
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index d59b3e0c69..d9feba328a 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1518,7 +1518,8 @@ gtk_assistant_set_current_page (GtkAssistant *assistant,
    * initial page is != to 0
    */
   if (GTK_WIDGET_MAPPED (assistant))
-    priv->visited_pages = g_slist_prepend (priv->visited_pages, page);
+    priv->visited_pages = g_slist_prepend (priv->visited_pages,
+					   priv->current_page);
 
   set_current_page (assistant, page);
 }