diff --git a/ChangeLog b/ChangeLog
index ff9dd9332e..87ce01ceb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-20  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_get_action_area): change return
+	value from GtkHButtonBox to GtkWidget.
+
 2008-06-20  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkhandlebox.h (struct _GtkHandleBox): deuglify formatting
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 6aac6c95d6..99bd11cd2f 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1485,11 +1485,11 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
  *
  * Returns the action area of @dialog.
  *
- * Returns: a #GtkHButtonBox.
+ * Returns: the action area.
  *
  * Since: GSEAL-branch
  **/
-GtkHButtonBox *
+GtkWidget *
 gtk_dialog_get_action_area (GtkDialog *dialog)
 {
   g_return_val_if_fail (GTK_IS_DIALOG (dialog), NULL);
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index e8a4d04728..f25311ecfe 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -34,7 +34,6 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkwindow.h>
-#include <gtk/gtkhbbox.h>
 
 
 G_BEGIN_DECLS
@@ -172,17 +171,17 @@ void gtk_dialog_response           (GtkDialog *dialog,
 /* Returns response_id */
 gint gtk_dialog_run                (GtkDialog *dialog);
 
-GtkHButtonBox* gtk_dialog_get_action_area (GtkDialog *dialog);
-void           gtk_dialog_pack_start      (GtkDialog *dialog,
-					   GtkWidget *widget,
-					   gboolean   expand,
-					   gboolean   fill,
-					   guint      padding);
-void           gtk_dialog_pack_end        (GtkDialog *dialog,
-					   GtkWidget *widget,
-					   gboolean   expand,
-					   gboolean   fill,
-					   guint      padding);
+GtkWidget * gtk_dialog_get_action_area (GtkDialog *dialog);
+void        gtk_dialog_pack_start      (GtkDialog *dialog,
+                                        GtkWidget *widget,
+                                        gboolean   expand,
+                                        gboolean   fill,
+                                        guint      padding);
+void        gtk_dialog_pack_end        (GtkDialog *dialog,
+                                        GtkWidget *widget,
+                                        gboolean   expand,
+                                        gboolean   fill,
+                                        guint      padding);
 
 /* For private use only */
 void _gtk_dialog_set_ignore_separator (GtkDialog *dialog,