diff -uNr linuxwacom-0.6.9/acinclude.m4 linuxwacom-0.6.9.new/acinclude.m4
--- linuxwacom-0.6.9/acinclude.m4	2005-07-27 23:30:28.000000000 +0100
+++ linuxwacom-0.6.9.new/acinclude.m4	2005-08-28 17:46:35.000000000 +0100
@@ -202,7 +202,7 @@
 [ WCM_XORGSDK="$withval"; ])
 if test -n "$WCM_XORGSDK"; then
 	AC_MSG_CHECKING(for valid Xorg SDK)
-	if test -f $WCM_XORGSDK/include/xf86Version.h; then
+	if test -f $WCM_XORGSDK/include/xorg/xf86Version.h; then
 		WCM_ENV_XORGSDK=yes
 		AC_MSG_RESULT(ok)
 	elif test -f $WCM_XORGSDK/xc/include/xf86Version.h; then
diff -uNr linuxwacom-0.6.9/aclocal.m4 linuxwacom-0.6.9.new/aclocal.m4
--- linuxwacom-0.6.9/aclocal.m4	2005-07-27 23:32:56.000000000 +0100
+++ linuxwacom-0.6.9.new/aclocal.m4	2005-08-28 17:47:13.000000000 +0100
@@ -215,7 +215,7 @@
 [ WCM_XORGSDK="$withval"; ])
 if test -n "$WCM_XORGSDK"; then
 	AC_MSG_CHECKING(for valid Xorg SDK)
-	if test -f $WCM_XORGSDK/include/xf86Version.h; then
+	if test -f $WCM_XORGSDK/include/xorg/xf86Version.h; then
 		WCM_ENV_XORGSDK=yes
 		AC_MSG_RESULT(ok)
 	elif test -f $WCM_XORGSDK/xc/include/xf86Version.h; then
diff -uNr linuxwacom-0.6.9/configure linuxwacom-0.6.9.new/configure
--- linuxwacom-0.6.9/configure	2005-08-09 22:16:05.000000000 +0100
+++ linuxwacom-0.6.9.new/configure	2005-08-28 17:47:53.000000000 +0100
@@ -8210,7 +8210,7 @@
 if test -n "$WCM_XORGSDK"; then
 	echo "$as_me:$LINENO: checking for valid Xorg SDK" >&5
 echo $ECHO_N "checking for valid Xorg SDK... $ECHO_C" >&6
-	if test -f $WCM_XORGSDK/include/xf86Version.h; then
+	if test -f $WCM_XORGSDK/include/xorg/xf86Version.h; then
 		WCM_ENV_XORGSDK=yes
 		echo "$as_me:$LINENO: result: ok" >&5
 echo "${ECHO_T}ok" >&6