diff -urN EloUsb/Imakefile EloUsb.bero/Imakefile
--- EloUsb/Imakefile	2003-08-21 09:47:42.000000000 +0000
+++ EloUsb.bero/Imakefile	2005-06-08 17:38:34.000000000 +0000
@@ -8,7 +8,7 @@
 
 DRIVER = elousb
 
-SERVERSRC=../../../xc/programs/Xserver
+SERVERSRC=/usr/X11R6/lib/Server
 XINCLUDESRC=../../../xc/include
 EXTINCSRC=../../../xc/programs/Xserver/hw/xfree86
 
diff -urN EloUsb/elousb.c EloUsb.bero/elousb.c
--- EloUsb/elousb.c	2003-08-21 09:47:42.000000000 +0000
+++ EloUsb.bero/elousb.c	2005-06-09 14:20:10.000000000 +0000
@@ -1,3 +1,4 @@
+// vim:ts=2:sw=2
 /* 
  * Copyright (c) 1998  Metro Link Incorporated
  *
@@ -459,33 +460,33 @@
 		xf86ErrorFVerb (5, "ReadInput: type(%d), code(%d), value(%d)\n",
 							event->type, event->code, event->value);
 		if (event->type == 3) 
-		{
+		{
 			if (event->code == 1) 
-			{
+			{
 				if (priv->swap_xy)
 				  cur_y = event->value;
 				else
 					cur_x = event->value;
-			}
-			else if (event->code == 2) 
-			{
+			}
+			else if (event->code == 2 || event->code == 0)
+			{
 				if (priv->swap_xy)
 				  cur_x = event->value;
 				else
 		 		  cur_y = event->value;
-			}
+			}
       else if (event->code == 11)
         cur_z = event->value;
-		}
+		}
 		else if ((event->type == 1) && (event->code == 272)) 
-		{
+		{
 			if (event->value == 1) 
-				state = ELO_PRESS;
+				state = ELO_PRESS;
 			else
-				state = ELO_RELEASE;
-		}
+				state = ELO_RELEASE;
+		}
 		  
-    x = cur_x;
+    x = 4095 - cur_x;
     y = 4095 - cur_y;
     
 			if ((state_memory[SCREEN_UNLOCK_ADDRESS+MemoryOffset] == 1) &&