diff --git a/gnokii/gnokii-dial.c b/gnokii/gnokii-dial.c
index f361c10..f946db3 100644
--- a/gnokii/gnokii-dial.c
+++ b/gnokii/gnokii-dial.c
@@ -52,24 +52,24 @@
 void dial_usage(FILE *f)
 {
 	fprintf(f, _("Dialling and call options:\n"
-		     "          --getspeeddial location\n"
-		     "          --setspeeddial number memory_type location\n"
-		     "          --dialvoice number\n"
-		     "          --senddtmf string\n"
-		     "          --answercall callid\n"
-		     "          --hangup callid\n"
+		     "          --getspeeddial <location>\n"
+		     "          --setspeeddial <number> <memory_type> <location>\n"
+		     "          --dialvoice <number>\n"
+		     "          --senddtmf <string>\n"
+		     "          --answercall <callid>\n"
+		     "          --hangup <callid>\n"
 		     "          --divert {--op|-o} {register|enable|query|disable|erasure}\n"
 		     "                 {--type|-t} {all|busy|noans|outofreach|notavail}\n"
 		     "                 {--call|-c} {all|voice|fax|data}\n"
-		     "                 [{--timeout|-m} time_in_seconds]\n"
-		     "                 [{--number|-n} number]\n"
+		     "                 [{--timeout|-m} <time in seconds>]\n"
+		     "                 [{--number|-n} <number>]\n"
 		     "All number, location and callid options need to be numeric.\n"
 		     ));
 }
 
 int getspeeddial_usage(FILE *f, int exitval)
 {
-	fprintf(f, _("usage: --getspeeddial location\n"
+	fprintf(f, _("usage: --getspeeddial <location>\n"
 			"                        location - location in the speed dial memory\n"
 	));
 	return exitval;
@@ -104,7 +104,7 @@ gn_error getspeeddial(char *number, gn_data *data, struct gn_statemachine *state
 
 int setspeeddial_usage(FILE *f, int exitval)
 {
-	fprintf(f, _("usage: --setspeeddial number memory_type location\n"
+	fprintf(f, _("usage: --setspeeddial <number> <memory_type> <location>\n"
 			"                        number      - phone number to be stored\n"
 			"                        memory_type - memory type for the speed dial\n"
 			"                        location    - location in the speed dial memory\n"
@@ -196,7 +196,7 @@ gn_error senddtmf(char *string, gn_data *data, struct gn_statemachine *state)
 
 int answercall_usage(FILE *f, int exitval)
 {
-	fprintf(f, _("usage: --answercall callid\n"
+	fprintf(f, _("usage: --answercall <callid>\n"
 			"                        callid - call identifier\n"
 	));
 	return exitval;
@@ -227,7 +227,7 @@ gn_error answercall(char *callid, gn_data *data, struct gn_statemachine *state)
 
 int hangup_usage(FILE *f, int exitval)
 {
-	fprintf(f, _("usage: --hangup callid\n"
+	fprintf(f, _("usage: --hangup <callid>\n"
 			"                        callid - call identifier\n"
 	));
 	return exitval;
@@ -259,22 +259,22 @@ gn_error hangup(char *callid, gn_data *data, struct gn_statemachine *state)
 int divert_usage(FILE *f, int exitval)
 {
 	fprintf(f, _(" usage: --divert\n"
-			"        -o operation\n"
-			"        --op operation       operation to be executed, needs to be one\n"
+			"        -o <operation>\n"
+			"        --op <operation>     operation to be executed, needs to be one\n"
 			"                             of the following: register, enable, query,\n"
 			"                             disable, erasure; this is required option\n"
-			"        -t type\n"
-			"        --type type          type of the operation, needs to be one of\n"
+			"        -t <type>\n"
+			"        --type <type>        type of the operation, needs to be one of\n"
 			"                             the following: all, busy, noans, outofreach,\n"
 			"                             notavail, unconditional; this is required option\n"
-			"        -c calltype\n"
-			"        --call calltype      type of call for the operation, needs to be\n"
+			"        -c <calltype>\n"
+			"        --call <calltype>    type of call for the operation, needs to be\n"
 			"                             one of the following: all, voice, fax, data;\n"
 			"                             this is optional\n"
-			"        -m sec\n"
-			"        --timeout sec        timeout to be set; the value is in seconds\n"
-			"        -n msisdn\n"
-			"        --number msisdn      number for redirection\n"
+			"        -m <sec>\n"
+			"        --timeout <sec>      timeout to be set; the value is in seconds\n"
+			"        -n <msisdn>\n"
+			"        --number <msisdn>    number for redirection\n"
 			"\n"
 		));
 	return exitval;