--- ./adjtimex.c.orig	2002-01-07 02:58:03.000000000 +0100
+++ ./adjtimex.c	2003-08-13 16:52:26.000000000 +0200
@@ -160,43 +160,35 @@
 void kalman_update(double *x, int xr, double *p, double *h,
 		   double *z, int zr, double *r);
 
-void
-usage(void)
+static void usage(void)
 {
-  char msg[]=
-"
-Usage: adjtimex  [OPTION]... 
-Mandatory or optional arguments to long options are mandatory or optional
-for short options too.
-
-Get/Set Kernel Time Parameters:
-       -p, --print               print values of kernel time variables
-       -t, --tick val            set the kernel tick interval in usec
-       -f, --frequency newfreq   set system clock frequency offset
-       -s, --singleshot adj      slew the system clock by adj usec
-       -o, --offset adj          add a time offset of adj usec
-       -m, --maxerror val        set maximum error (usec)
-       -e, --esterror val        set estimated error (usec)
-       -T, --timeconstant val    set phase locked loop time constant
-       -a, --adjust[=count]      set system clock parameters per CMOS 
-                                 clock or (with --review) log file
-
-Estimate Systematic Drifts:
-       -c, --compare[=count]     compare system and CMOS clocks
-       -i, --interval tim        set clock comparison interval (sec)
-       -l, --log[=file]          log current times to file
-           --host timeserver     query the timeserver
-       -w, --watch               get current time from user
-       -r, --review[=file]       review clock log file, estimate drifts
-       -u, --utc                 the CMOS clock is set to UTC
-
-Informative Output:
-           --help                print this help, then exit
-       -v, --version             print adjtimex program version, then exit
-";
-
-  fputs(msg, stdout);
-  exit(0);
+	fprintf(stderr,
+		"Usage: adjtimex [OPTION]...\n\n"
+		"Mandatory or optional arguments to long options are mandatory or optional\n"
+		"for short options too.\n\n"
+		"Get/Set Kernel Time Parameters:\n"
+		"       -p, --print               print values of kernel time variables\n"
+		"       -t, --tick val            set the kernel tick interval in usec\n"
+		"       -f, --frequency newfreq   set system clock frequency offset\n"
+		"       -s, --singleshot adj      slew the system clock by adj usec\n"
+		"       -o, --offset adj          add a time offset of adj usec\n"
+		"       -m, --maxerror val        set maximum error (usec)\n"
+		"       -e, --esterror val        set estimated error (usec)\n"
+		"       -T, --timeconstant val    set phase locked loop time constant\n"
+		"       -a, --adjust[=count]      set system clock parameters per CMOS\n"
+		"                                 clock or (with --review) log file\n\n"
+		"Estimate Systematic Drifts:\n"
+		"       -c, --compare[=count]     compare system and CMOS clocks\n"
+                "       -i, --interval tim        set clock comparison interval (sec)\n"
+                "       -l, --log[=file]          log current times to file\n"
+                "           --host timeserver     query the timeserver\n"
+                "       -w, --watch               get current time from user\n"
+                "       -r, --review[=file]       review clock log file, estimate drifts\n"
+                "       -u, --utc                 the CMOS clock is set to UTC\n\n"
+                "Informative Output:\n"
+                "           --help                print this help, then exit\n"
+		"       -v, --version             print adjtimex program version, then exit\n\n");
+	exit(0);
 }
 
 int