diff --git a/ChangeLog b/ChangeLog
index f7578d375d..b52809feb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-18  Sven Neumann  <sven@gimp.org>
+
+	* gtk/Makefile.am (STOCK_ICONS)
+	* gtk/stock-icons/16/gtk-page-setup.png
+	* gtk/stock-icons/24/gtk-page-setup.png: added page-setup icons
+	taken from GNOME icon theme.
+
+	* gtk/gtkstock.[ch]: added GTK_STOCK_PAGE_SETUP. Closes bug #514410.
+
 2008-02-18  Runa Bhattacharjee <runabh@gmail.com>
 
 	* configure.in: Added Kannada (kn) to ALL_LINGUAS
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 4e485ed3dc..5ec6e27733 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-18  Sven Neumann  <sven@gimp.org>
+
+	* gtk/tmpl/gtkstock.sgml: added GTK_STOCK_PAGE_SETUP.
+
 2008-02-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtk-docs.sgml:
diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml
index e4ac541a2d..65e9c3c499 100644
--- a/docs/reference/gtk/tmpl/gtkstock.sgml
+++ b/docs/reference/gtk/tmpl/gtkstock.sgml
@@ -720,6 +720,15 @@ The "Reverse Portrait Orientation" item.
 @Since: 2.10
 
 
+<!-- ##### MACRO GTK_STOCK_PAGE_SETUP ##### -->
+<para>
+The "Page Setup" item.
+<inlinegraphic fileref="gtk-page-setup.png" format="PNG"></inlinegraphic>
+</para>
+
+@Since: 2.14
+
+
 <!-- ##### MACRO GTK_STOCK_PASTE ##### -->
 <para>
 The "Paste" item.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 93f48add98..1f8357e699 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -972,6 +972,7 @@ STOCK_ICONS = \
 	stock-icons/16/gtk-network.png        		\
 	stock-icons/16/gtk-new.png    			\
 	stock-icons/16/gtk-open.png   			\
+	stock-icons/16/gtk-page-setup.png 		\
 	stock-icons/16/gtk-paste.png  			\
 	stock-icons/16/gtk-preferences.png    		\
 	stock-icons/16/gtk-print.png  			\
@@ -1073,6 +1074,7 @@ STOCK_ICONS = \
 	stock-icons/24/gtk-orientation-landscape.png	\
 	stock-icons/24/gtk-orientation-reverse-portrait.png	\
 	stock-icons/24/gtk-orientation-portrait.png	\
+	stock-icons/24/gtk-page-setup.png 		\
 	stock-icons/24/gtk-paste.png  			\
 	stock-icons/24/gtk-preferences.png    		\
 	stock-icons/24/gtk-print.png  			\
diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index 78aef85382..c50cf9a236 100644
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -374,6 +374,7 @@ static const GtkStockItem builtin_items [] =
   { GTK_STOCK_ORIENTATION_PORTRAIT, N_("Portrait"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, N_("Reverse landscape"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, N_("Reverse portrait"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PAGE_SETUP, N_("Page Set_up"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_PASTE, N_("_Paste"), GDK_CONTROL_MASK, 'v', GETTEXT_PACKAGE },
   { GTK_STOCK_PREFERENCES, N_("_Preferences"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_PRINT, N_("_Print"), 0, 0, GETTEXT_PACKAGE },
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 75d3b1fdc0..f4d0e3ac32 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -139,6 +139,7 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
 #define GTK_STOCK_ORIENTATION_LANDSCAPE "gtk-orientation-landscape"
 #define GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE "gtk-orientation-reverse-landscape"
 #define GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT "gtk-orientation-reverse-portrait"
+#define GTK_STOCK_PAGE_SETUP       "gtk-page-setup"
 #define GTK_STOCK_PASTE            "gtk-paste"
 #define GTK_STOCK_PREFERENCES      "gtk-preferences"
 #define GTK_STOCK_PRINT            "gtk-print"
diff --git a/gtk/stock-icons/16/gtk-page-setup.png b/gtk/stock-icons/16/gtk-page-setup.png
new file mode 100644
index 0000000000..61b46d998c
Binary files /dev/null and b/gtk/stock-icons/16/gtk-page-setup.png differ
diff --git a/gtk/stock-icons/24/gtk-page-setup.png b/gtk/stock-icons/24/gtk-page-setup.png
new file mode 100644
index 0000000000..9acf0d5ff2
Binary files /dev/null and b/gtk/stock-icons/24/gtk-page-setup.png differ