diff --git a/ChangeLog b/ChangeLog
index 35a7288c56..f49a40840a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-21  Matthias Clasen <mclasen@redhat.com>
+
+	* configure.in: Bump gtk-doc dependency to 1.11 for
+	nicer index-generation.
+
+2008-11-21  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtkmountoperation.[hc]: Declare structs in a way that
+	gtk-doc understands.
+
 2008-11-17  Christian Dywan  <christian@imendio.com>
 
 	Bug 377699 – realizing gtk.Progress() causes SEGV
diff --git a/configure.in b/configure.in
index f00157c826..6c0d47a3a5 100644
--- a/configure.in
+++ b/configure.in
@@ -1906,7 +1906,7 @@ fi
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.8])
+GTK_DOC_CHECK([1.11])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 42c98f786b..b33dafcedf 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -102,7 +102,7 @@ enum {
 
 };
 
-struct GtkMountOperationPrivate {
+struct _GtkMountOperationPrivate {
   GtkWindow *parent_window;
   GtkDialog *dialog;
   GdkScreen *screen;
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index b0a6b04f33..f006082dab 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -40,18 +40,18 @@ G_BEGIN_DECLS
 #define GTK_IS_MOUNT_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_MOUNT_OPERATION))
 #define GTK_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_MOUNT_OPERATION, GtkMountOperationClass))
 
-typedef struct GtkMountOperation         GtkMountOperation;
-typedef struct GtkMountOperationClass    GtkMountOperationClass;
-typedef struct GtkMountOperationPrivate  GtkMountOperationPrivate;
+typedef struct _GtkMountOperation         GtkMountOperation;
+typedef struct _GtkMountOperationClass    GtkMountOperationClass;
+typedef struct _GtkMountOperationPrivate  GtkMountOperationPrivate;
 
-struct GtkMountOperation
+struct _GtkMountOperation
 {
   GMountOperation parent_instance;
 
   GtkMountOperationPrivate *priv;
 };
 
-struct GtkMountOperationClass
+struct _GtkMountOperationClass
 {
   GMountOperationClass parent_class;