diff --git a/ChangeLog b/ChangeLog
index 75ffeed52..de1427e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/stock-icons/{16,24}/gtk-caps-lock-warning.png: New icons
+	* gtk/gtkstock.h: Add GTK_STOCK_CAPS_LOCK_WARNING.
+	* gtk/gtkiconfactory.c (get_default_icons): Register the stock icon.
+	* gtk/gtkentry.c (show_capslock_feedback): Use the new stock icon.
+
 2009-01-05  Tor Lillqvist  <tml@novell.com>
 
 	Bug 566628 - gdk_display_close always asserts on win32
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index d6c5b6bdd..0a4b01ddb 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_CAPS_LOCK_WARNING
+	* gtk/Makefile.am: And copy the icon
+
 2009-01-04  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 566045 – GtkViewport is lacking a description
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index cf819d58a..7f5b9b3c1 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -181,6 +181,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-bold.png			\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png			\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-clear.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-close.png			\
diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml
index 65e6a509b..6da3b7b0f 100644
--- a/docs/reference/gtk/tmpl/gtkstock.sgml
+++ b/docs/reference/gtk/tmpl/gtkstock.sgml
@@ -151,6 +151,15 @@ The "Cancel" item.
 
 
 
+<!-- ##### MACRO GTK_STOCK_CAPS_LOCK_WARNING ##### -->
+<para>
+The "Caps Lock Warning" icon.
+<inlinegraphic fileref="gtk-caps-lock-warning.png" format="PNG"></inlinegraphic>
+</para>
+
+@Since: 2.16
+
+
 <!-- ##### MACRO GTK_STOCK_CDROM ##### -->
 <para>
 The "CD-Rom" item.
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 20a21c8a3..5db98af14 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -9339,7 +9339,7 @@ show_capslock_feedback (GtkEntry    *entry,
 
   if (gtk_entry_get_storage_type (entry, GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
     {
-      gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_INFO);
+      gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CAPS_LOCK_WARNING);
       gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
       priv->caps_lock_warning_shown = TRUE;
     }
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index ba90ddd09..cced1108e 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -509,6 +509,7 @@ get_default_icons (GtkIconFactory *factory)
   register_stock_icon (factory, GTK_STOCK_CONNECT);
   register_stock_icon (factory, GTK_STOCK_DISCONNECT);
   register_stock_icon (factory, GTK_STOCK_EDIT);
+  register_stock_icon (factory, GTK_STOCK_CAPS_LOCK_WARNING);
   register_bidi_stock_icon (factory, 
 			    GTK_STOCK_MEDIA_FORWARD,
 			    GTK_STOCK_MEDIA_FORWARD "-ltr",
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 8fef6d479..2cbe0b61e 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -84,6 +84,7 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
 #define GTK_STOCK_APPLY            "gtk-apply"
 #define GTK_STOCK_BOLD             "gtk-bold"
 #define GTK_STOCK_CANCEL           "gtk-cancel"
+#define GTK_STOCK_CAPS_LOCK_WARNING "gtk-caps-lock-warning"
 #define GTK_STOCK_CDROM            "gtk-cdrom"
 #define GTK_STOCK_CLEAR            "gtk-clear"
 #define GTK_STOCK_CLOSE            "gtk-close"
diff --git a/gtk/stock-icons/16/gtk-caps-lock-warning.png b/gtk/stock-icons/16/gtk-caps-lock-warning.png
new file mode 100644
index 000000000..0dfa41876
Binary files /dev/null and b/gtk/stock-icons/16/gtk-caps-lock-warning.png differ
diff --git a/gtk/stock-icons/24/gtk-caps-lock-warning.png b/gtk/stock-icons/24/gtk-caps-lock-warning.png
new file mode 100644
index 000000000..ca76d509b
Binary files /dev/null and b/gtk/stock-icons/24/gtk-caps-lock-warning.png differ