diff --git a/src/avra.c b/src/avra.c
index 5aec61d..eba2406 100644
--- a/src/avra.c
+++ b/src/avra.c
@@ -40,30 +40,26 @@
 const char *title = "AVRA: advanced AVR macro assembler (version %s)\n";
 
 const char *usage =
-    "usage: avra [-f][O|M|I|G] output file type\n"
-    "            [-o <filename>] output file name\n"
-    "            [-d <filename>] debug file name\n"
-    "            [-e <filename>] file name to output EEPROM contents\n"
-    "            [-l <filename>] generate list file\n"
-    "            [-m <mapfile>] generate map file\n"
-    "            [--define <symbol>[=<value>]]\n"
-    "            [-I <dir>] [--listmac]\n"
-    "            [--max_errors <number>] [--devices] [--version]\n"
-    "            [-O e|w|i]\n"
-    "            [-h] [--help] general help\n"
-    "            <file to assemble>\n"
-    "\n"
-    "   --listfile    -l : Create list file\n"
-    "   --mapfile     -m : Create map file\n"
-    "   --define      -D : Define symbol.\n"
-    "   --includedir  -I : Additional include paths. Default: %s\n"
-    "   --listmac        : List macro expansion in listfile.\n"
-    "   --max_errors     : Maximum number of errors before exit\n"
-    "                      (default: 10)\n"
-    "   --devices        : List out supported devices.\n"
-    "   --version        : Version information.\n"
-    "   -O e|w|i         : Issue error/warning/ignore overlapping code.\n"
-    "   --help, -h       : This help text.\n";
+    "Usage: avra [OPTION]... FILE\n"
+    "Options:\n"
+    "   -d, --debugfile <filename>       debug file name\n"
+    "   -D, --define <symbol>[=<value>]  define symbol\n"
+    "   -e, --eepfile <filename>         create EEPROM contents file\n"
+    "   -f, --filetype O|M|I|G           output file type\n"
+    "   -I, --includepath <dir>          additional include paths\n"
+    "                                    (default: %s)\n"
+    "   -l, --listfile <filename>        create list file\n"
+    "   -m, --mapfile <mapfile>          create map file\n"
+    "   -o, --outfile <filename>         output file name\n"
+    "   -O, --overlap e|w|i              issue error/warning/ignore overlapping code\n"
+    "   --devices                        list out supported devices\n"
+    "   --listmac                        list macro expansion in listfile\n"
+    "   --max_errors <number>            maximum number of errors before exit\n"
+    "                                    (default: 10)\n"
+    "   --version                        version information\n"
+    "   -h, --help                       general help\n"
+    "   FILE                             file to assemble\n"
+    ;
 
 const struct dataset overlap_choice[4] = {
 	{ OVERLAP_ERROR,   "e"},