diff --git a/ChangeLog b/ChangeLog
index 79c77331b2..901f7b54aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscrolledwindow.c: Document scrollbars-within-bevel
+	as 2.12 addition.  (#438131, Mart Raudsepp)
+
 2007-05-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkvseparator.c (gtk_vseparator_size_request): Fix
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 9244ef975b..584a2bd99d 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -280,6 +280,13 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
 						      GTK_SHADOW_NONE,
                                                       GTK_PARAM_READABLE | GTK_PARAM_WRITABLE));
 
+  /**
+   * GtkScrolledWindow:scrollbars-within-bevel:
+   *
+   * Whether to place scrollbars within the scrolled window's bevel.
+   *
+   * Since: 2.12
+   */
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_boolean ("scrollbars-within-bevel",
 							         P_("Scrollbars within bevel"),