diff --git a/man/nm-online.1.in b/man/nm-online.1.in
index 6225f4a301..941f006b86 100644
--- a/man/nm-online.1.in
+++ b/man/nm-online.1.in
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright (C) 2010 Red Hat, Inc.
 .\"
-.TH NM-ONLINE "1" "6 August 2010"
+.TH NM-ONLINE "1" "11 July 2013"
 
 .SH NAME
 nm-online \- ask NetworkManager whether the network is connected
@@ -38,9 +38,9 @@ exit, the returned status code should be checked (see the return codes bellow).
 
 .SH OPTIONS
 .TP
-.B \-t, \-\-timeout
-Time to wait for a connection, in seconds.  If not specified, the default is 30
-seconds.
+.B \-t, \-\-timeout <timeout_value>
+Time to wait for a connection, in seconds.  If the option is not provided,
+the default timeout is 30 seconds.
 .TP
 .B \-x, \-\-exit
 Exit immediately if NetworkManager is not running or connecting.
diff --git a/test/nm-online.c b/test/nm-online.c
index 4b3ae9a645..f1777374c9 100644
--- a/test/nm-online.c
+++ b/test/nm-online.c
@@ -139,7 +139,7 @@ int main (int argc, char *argv[])
 	gboolean success;
 
 	GOptionEntry options[] = {
-		{"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (default is 30)"), NULL},
+		{"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (without the option, default value is 30)"), "<timeout>"},
 		{"exit", 'x', 0, G_OPTION_ARG_NONE, &exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL},
 		{"quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Don't print anything"), NULL},
 		{NULL}