diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 32e4878e05..aa57b69d8e 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -231,7 +231,7 @@ Flags used to influence dialog construction.
 @GTK_DIALOG_DESTROY_WITH_PARENT: Destroy the dialog when its
   parent is destroyed, see gtk_window_set_destroy_with_parent().
 @GTK_DIALOG_NO_SEPARATOR: Don't put a separator between the
-  action area and the dialog content.
+  action area and the dialog content. This option has been deprecated in GTK+ 2.22. It will be removed in GTK+ 3
 
 <!-- ##### ENUM GtkResponseType ##### -->
 <para>
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index d6b7bcd682..81042a3098 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -138,6 +138,8 @@ gtk_dialog_class_init (GtkDialogClass *class)
    * GtkDialog:has-separator:
    *
    * When %TRUE, the dialog has a separator bar above its buttons.
+   *
+   * Deprecated: 2.22: This property will be removed in GTK+ 3.
    */
   g_object_class_install_property (gobject_class,
                                    PROP_HAS_SEPARATOR,
@@ -145,7 +147,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
 							 P_("Has separator"),
 							 P_("The dialog has a separator bar above its buttons"),
                                                          TRUE,
-                                                         GTK_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
 
   /**
    * GtkDialog::response:
@@ -852,6 +854,8 @@ gtk_dialog_set_default_response (GtkDialog *dialog,
  *
  * Sets whether the dialog has a separator above the buttons.
  * %TRUE by default.
+ *
+ * Deprecated: 2.22: This function will be removed in GTK+ 3
  **/
 void
 gtk_dialog_set_has_separator (GtkDialog *dialog,
@@ -899,6 +903,8 @@ gtk_dialog_set_has_separator (GtkDialog *dialog,
  * Accessor for whether the dialog has a separator.
  * 
  * Return value: %TRUE if the dialog has a separator
+ *
+ * Deprecated: 2.22: This function will be removed in GTK+ 3
  **/
 gboolean
 gtk_dialog_get_has_separator (GtkDialog *dialog)
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 18a18961c8..5de720df51 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -153,9 +153,11 @@ GtkWidget* gtk_dialog_get_widget_for_response (GtkDialog *dialog,
 gint gtk_dialog_get_response_for_widget (GtkDialog *dialog,
 					 GtkWidget *widget);
 
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 void     gtk_dialog_set_has_separator (GtkDialog *dialog,
                                        gboolean   setting);
 gboolean gtk_dialog_get_has_separator (GtkDialog *dialog);
+#endif
 
 gboolean gtk_alternative_dialog_button_order (GdkScreen *screen);
 void     gtk_dialog_set_alternative_button_order (GtkDialog *dialog,
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 408cb44b86..30b8e44c74 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -196,6 +196,8 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
    * in the dialog.
    *
    * Since: 2.4
+   *
+   * Deprecated: 2.22: This style property will be removed in GTK+ 3
    */
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_boolean ("use-separator",