diff --git a/ChangeLog b/ChangeLog
index b8a6aad..2974539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17  Lucas Rocha  <lucasr@gnome.org>
+
+	* src/option.c: added arg_description for --timeout option (Fixes 
+	bug #516876). Patch from Luca Ferretti <elle.uca@libero.it>. 
+
 2008-03-17  Lucas Rocha  <lucasr@gnome.org>
 
 	* src/scale.c (zenity_scale): set value range before setting value 
diff --git a/src/option.c b/src/option.c
index 68d655f..babe4e9 100644
--- a/src/option.c
+++ b/src/option.c
@@ -151,7 +151,8 @@ static GOptionEntry general_options[] = {
     G_OPTION_ARG_INT,
     &zenity_general_timeout_delay,
     N_("Set dialog timeout in seconds"),
-    NULL
+    /* Timeout for closing the dialog */
+    N_("TIMEOUT")
   },
   {
     NULL