diff --git a/ChangeLog b/ChangeLog
index 05b5ca3d48..8075f7781b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-07  Yevgen Muntyan  <muntyan@tamu.edu>
+
+	* gtk/gtkprintunixdialog.c:
+	* gtk/gtkpagesetupunixdialog.c: added alternative button order in
+	Print and Page Setup dialogs.
+
 2007-12-07 13:16:33  Tim Janik  <timj@imendio.com>
 
 	* Makefile.decl: skip tests if gdktarget!=x11, since GUI tests need
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 7559ab952f..ea4733c9da 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -322,6 +322,10 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog)
                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                           GTK_STOCK_APPLY, GTK_RESPONSE_OK,
                           NULL);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+					   GTK_RESPONSE_OK,
+					   GTK_RESPONSE_CANCEL,
+					   -1);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 }
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index b5c8e263a4..8fcf9c4a98 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -298,6 +298,11 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
 			  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			  GTK_STOCK_PRINT, GTK_RESPONSE_OK,
                           NULL);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+					   GTK_RESPONSE_APPLY,
+					   GTK_RESPONSE_OK,
+					   GTK_RESPONSE_CANCEL,
+					   -1);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);