diff --git a/ChangeLog b/ChangeLog
index 3afa29c119..08935e4d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-17  Matthias Clasen <mclasen@redhat.com>
+
+	* README.in: Updates
+
+	* gtk/gtkmenushell.c: Make GtkMenuShell as an abstract type.
+	It was already documented as such.  (#412357, Vincent Geddes)
+
 2007-06-17  Matthias Clasen <mclasen@redhat.com>
 
 	* gtk/gtkcontainer.c: Fix a doc typo.
diff --git a/README.in b/README.in
index 150db7ed58..800d066ce5 100644
--- a/README.in
+++ b/README.in
@@ -77,8 +77,15 @@ Release notes for 2.12
   now passed the print settings on the command line with the --print-settings
   parameter pointing to a temp file containing the settings. The preview
   application assumes ownership of the file and should delete it once it does
-  not need it anymore. This feature requires Evince version 0.9.0 or above.
+  not need it anymore. The --print-settings commandline option is understood
+  by Evince 0.9.0 and newer. To use a different print preview application,
+  change the gtk-print-preview-command setting in your gtkrc file, e.g.
+  gtk-print-preview-command = "ggv %f"
 
+* GtkMenuShell is now defined as an abstract type. It was already 
+  documented as an abstract class, and there is little reason to 
+  instantiate it.
+  
 
 Release notes for 2.10
 ======================
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 4d6f01f221..a9788a2949 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-docs.sgml: Move GtkMenuShell to the abstract widgets.
+
 2007-06-17  Jan Arne Petersen  <jpetersen@jpetersen.org>
 
 	* gtk/gtk-docs.sgml: Add GtkTooltip. (#448341)
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 4447661c75..b530992f09 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -446,7 +446,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
         &GtkMenu;
         &GtkMenuBar;
         &GtkMenuItem;
-        &GtkMenuShell;
 	&GtkImageMenuItem;
         &GtkRadioMenuItem;
         &GtkCheckMenuItem;      
@@ -556,6 +555,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
         &GtkButtonBox;
         &GtkContainer;
         &GtkItem;
+        &GtkMenuShell;
         &GtkMisc;
         &GtkObject;
         &GtkPaned;
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 0faa087204..fc60f51dbc 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -199,7 +199,7 @@ static gboolean gtk_menu_shell_real_move_selected (GtkMenuShell  *menu_shell,
 
 static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
+G_DEFINE_ABSTRACT_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
 
 static void
 gtk_menu_shell_class_init (GtkMenuShellClass *klass)