diff --git a/ChangeLog b/ChangeLog
index 7d40fab1e8..19b7f49cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-31  Matthisa Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkclipboard.c (gtk_clipboard_store): Use a second-grandularity
+	timer for the store timeout.
+
 2008-07-31  Matthisa Clasen  <mclasen@redhat.com>
 
 	* gdk/gdk.[hc]:
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 2ce9937583..74b81aab9a 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -2023,7 +2023,7 @@ gtk_clipboard_store (GtkClipboard *clipboard)
   clipboard->storing_selection = TRUE;
 
   clipboard->store_loop = g_main_loop_new (NULL, TRUE);
-  clipboard->store_timeout = g_timeout_add (10000, (GSourceFunc) gtk_clipboard_store_timeout, clipboard);
+  clipboard->store_timeout = g_timeout_add_seconds (10, (GSourceFunc) gtk_clipboard_store_timeout, clipboard);
 
   if (g_main_loop_is_running (clipboard->store_loop))
     {