Index: xf86-input-evtouch-0.8.7/evtouch.c
===================================================================
--- xf86-input-evtouch-0.8.7.orig/evtouch.c	2009-02-07 13:14:23.000000000 +0800
+++ xf86-input-evtouch-0.8.7/evtouch.c	2009-02-07 15:42:46.000000000 +0800
@@ -917,12 +917,22 @@
 
 
                 if (priv->rotate == EV_ROTATE_NONE) {
-                        screen_width  = pScrn->currentMode->HDisplay;
-                        screen_height = pScrn->currentMode->VDisplay;
+			if (rotation == RR_Rotate_0 || rotation == RR_Rotate_180) {
+                        	screen_width  = pScrn->currentMode->HDisplay;
+                        	screen_height = pScrn->currentMode->VDisplay;
+			} else {
+                        	screen_width  = pScrn->currentMode->VDisplay;
+                        	screen_height = pScrn->currentMode->HDisplay;
+			}
 /* Swapping is done below in Coords! Leave those to be able to calc correct mapping */
                 } else {
-                        screen_width  = pScrn->currentMode->VDisplay;
-                        screen_height = pScrn->currentMode->HDisplay;
+			if (rotation == RR_Rotate_0 || rotation == RR_Rotate_180) {
+                        	screen_width  = pScrn->currentMode->VDisplay;
+                        	screen_height = pScrn->currentMode->HDisplay;
+			} else {
+                        	screen_width  = pScrn->currentMode->HDisplay;
+                        	screen_height = pScrn->currentMode->VDisplay;
+			}
                 }
 
                 if (xc < (max_x / 2)) {
Index: xf86-input-evtouch-0.8.7/ev_calibrate.c
===================================================================
--- xf86-input-evtouch-0.8.7.orig/ev_calibrate.c	2009-02-07 13:14:19.000000000 +0800
+++ xf86-input-evtouch-0.8.7/ev_calibrate.c	2009-02-07 13:14:23.000000000 +0800
@@ -17,7 +17,7 @@
 #include "config.h"
 
 #ifndef CURSORDIRECTORY
-#define CURSORDIRECTORY ""
+#define CURSORDIRECTORY "."
 #endif
 
 pthread_mutex_t got_min_max_mtx;