--- src/diff.c.orig	2004-04-12 09:44:35.000000000 +0200
+++ src/diff.c	2005-11-02 22:50:02.000000000 +0100
@@ -852,8 +852,6 @@
 }
 
 static char const * const option_help_msgid[] = {
-  N_("Compare files line by line."),
-  "",
   N_("-i  --ignore-case  Ignore case differences in file contents."),
   N_("--ignore-file-name-case  Ignore case when comparing file names."),
   N_("--no-ignore-file-name-case  Consider case when comparing file names."),
@@ -927,13 +925,6 @@
   "",
   N_("-v  --version  Output version info."),
   N_("--help  Output this help."),
-  "",
-  N_("FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'."),
-  N_("If --from-file or --to-file is given, there are no restrictions on FILES."),
-  N_("If a FILE is `-', read standard input."),
-  N_("Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."),
-  "",
-  N_("Report bugs to <address@hidden>."),
   0
 };
 
@@ -944,6 +935,8 @@
 
   printf (_("Usage: %s [OPTION]... FILES\n"), program_name);
 
+  printf ("%s\n\n", _("Compare files line by line."));
+  
   for (p = option_help_msgid;  *p;  p++)
     {
       if (!**p)
@@ -962,6 +955,13 @@
 	  printf ("  %s\n" + 2 * (*msg != ' ' && *msg != '-'), msg);
 	}
     }
+  
+  printf("\n%s\n%s\n%s\n%s\n\n%s\n",
+         _("FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'."),
+         _("If --from-file or --to-file is given, there are no restrictions on FILES."),
+         _("If a FILE is `-', read standard input."),
+         _("Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."),
+         _("Report bugs to <address@hidden>."));
 }
 
 /* Set VAR to VALUE, reporting an OPTION error if this is a