diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index ec881126f..70c69152d 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.26 2002/09/29 23:39:46 keithp Exp $ 
+ * $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.28 2002/10/08 21:28:04 keithp Exp $ 
  *
  * Copyright © 1999 Keith Packard
  *
@@ -334,7 +334,7 @@ ddxUseMsg()
 {
   ErrorF("\nTinyX Device Dependent Usage:\n");
   ErrorF("-card pcmcia	Use PCMCIA card as additional screen\n");
-  ErrorF("-screen WIDTHxHEIGHT[xDEPTH[xFREQ]][@ROTATION]	Specify screen characteristics\n");
+  ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP{,DEPTH/BPP}[xFREQ]]	Specify screen characteristics\n");
   ErrorF("-zaphod		Disable cursor screen switching\n");
   ErrorF("-2button	Emulate 3 button mouse\n");
   ErrorF("-3button	Disable 3 button mouse emulation\n");
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index e65270bfd..97b4f6fea 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.26 2002/10/04 01:44:20 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.27 2002/10/30 21:25:53 keithp Exp $ */
 
 #include "kdrive.h"
 #include "inputstr.h"
@@ -400,11 +400,12 @@ KdComputeMouseMatrix (KdMouseMatrix *m, Rotation randr, int width, int height)
 	break;
     }
     for (i = 0; i < 2; i++)
+    {
+	m->matrix[i][2] = 0;
 	for (j = 0 ; j < 2; j++)
 	    if (m->matrix[i][j] < 0)
 		m->matrix[i][2] = size[j] - 1;
-	    else
-		m->matrix[i][2] = 0;
+    }
 }
 
 static void