diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 5f9de9dcb..7843b53d6 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -18,6 +18,9 @@ http://www.newbreedsoftware.com/tuxpaint/
     "--lang" called incorrectly, or as "--lang list" or "--lang help".
     (Suggested by Ben Armstrong)
 
+  * Reorganized usage display
+    (Suggested by Ben Armstrong)
+
 
 2003.Aug.18 (0.9.12)
   * Replaced "efont-serif" fonts with those from the 'ttf-freefont' package,
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 0d44189ba..f172b2b28 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -3351,34 +3351,48 @@ void show_version(void)
 }
 
 
+/* FIXME: Re-order the usage in a sane way! */
+
 /* Show usage display: */
 
 void show_usage(FILE * f, char * prg)
 {
+  char * blank;
+  int i;
+
+  blank = strdup(prg);
+
+  for (i = 0; i < strlen(blank); i++)
+    blank[i] = ' ';
+
   fprintf(f,
     "\n"
     "Usage: %s {--usage | --help | --version | --copying}\n"
-    "       %s [--fullscreen] [--800x600] [--nosound] [--noquit] [--noprint]\n"
-    "          [--simpleshapes] [--uppercase] [--grab] [--nowheelmouse]\n"
-    "          [--nofancycursors] [--keyboard] [--nooutlines] [--nostamps]\n"
-    "          [--savedir DIRECTORY] [--saveover] [--saveovernew]\n"
-    "       %s [--windowed] [--640x480] [--sound] [--quit] [--print]\n"
-    "          [--complexshapes] [--mixedcase] [--dontgrab] [--wheelmouse]\n"
-    "          [--fancycursors] [--mouse] [--outlines] [--stamps]\n"
-    "          [--saveoverask]\n"
+    "\n"
+    "       %s [--windowed | --fullscreen]   [--640x480 | --800x600]\n"
+    "       %s [--sound | --nosound]         [--quit | --noquit]\n"
+    "       %s [--print | --noprint]         [--complexshapes | --simpleshapes]\n"
+    "       %s [--mixedcase | --uppercase]   [--fancycursors | --nofancycursors]\n"
+    "       %s [--mouse | --keyboard]        [--dontgrab | --grab]\n"
+    "       %s [--outlines | --nooutlines]   [--stamps | --nostamps]\n"
+    "       %s [--wheelmouse | --nowheelmouse]\n"
+    "       %s [--saveoverask | --saveover | --saveovernew]\n"
+    "       %s [--savedir DIRECTORY]\n"
 #ifdef WIN32
     "       %s [--printcfg | --noprintcfg]\n"
 #endif
     "       %s [--printdelay=SECONDS]\n"
     "       %s [--lang LANGUAGE | --locale LOCALE]\n"
     "       %s [--nosysconfig]\n"
-    /* "       %s [--record FILE | --playback FILE]\n" */
+ /* "       %s [--record FILE | --playback FILE]\n" */
     "\n",
-    prg, prg, prg,
-#ifdef WIN32
-    prg,
-#endif
-    prg, prg, prg  /* , prg */ );
+    prg, prg,
+    blank, blank, blank,
+    blank, blank, blank,
+    blank, blank, blank,
+    blank, blank);
+
+  free(blank);
 }