Index: tools/convcard.c
===================================================================
--- tools/convcard.c	(revision 170)
+++ tools/convcard.c	(working copy)
@@ -28,11 +28,16 @@
 
 static void usage (char *name, int ecode)
 {
-  fprintf (stderr, "Usage: %s\n", name);
-  fprintf (stderr, "%s <file>\tFilename is the vcard to convert. Output will go to stdout.\n", name);
-  fprintf (stderr, "--out <file>\tStore the output in this file (No output to stdout)\n");
-  fprintf (stderr, "--from-vcard2.1\tTreat file as 2.1 vcard (No autodetection)\n");
-  fprintf (stderr, "--from-vcard3.0\tTreat file as 3.0 vcard (No autodetection)\n");
+  fprintf (stderr, "Usage: %s [options] <source>\n\n", name);
+	fprintf (stderr, "Converts a vCard version 2.1 in a vCard version 3.0 and vice versa.\n");
+	fprintf (stderr, "By default the source file format is autodetected, and is converted to\n");
+	fprintf (stderr, "the other format.\n\n");
+	fprintf (stderr, "One of the tools from OpenSync.\n\n");
+	fprintf (stderr, "Options:\n");
+  fprintf (stderr, "  <source>\t\tThe vcard to convert.\n");
+  fprintf (stderr, "  --out <file>\t\tSave the output in <file>.  Default is stdout.\n");
+  fprintf (stderr, "  --from-vcard2.1\tTreat <source> as 2.1 vcard.\n");
+  fprintf (stderr, "  --from-vcard3.0\tTreat <source> as 3.0 vcard.\n");
   exit (ecode);
 }
 
@@ -116,7 +121,7 @@
 	OSyncObjFormat *targetformat = NULL;
 	
 	int i;
-	for (i = 2; i < argc; i++) {
+	for (i = 1; i < argc; i++) {
 		char *arg = argv[i];
 		if (!strcmp (arg, "--from-vcard2.1")) {
 			type = DETECT_VCARD_21;