diff -Naur hwsetup-1.2/hwsetup.c hwsetup-1.2-xorg/hwsetup.c
--- hwsetup-1.2/hwsetup.c	2006-11-12 23:09:34.000000000 +0100
+++ hwsetup-1.2-xorg/hwsetup.c	2007-03-29 21:10:11.000000000 +0200
@@ -34,8 +34,8 @@
 
 /* Note: These are for Xfree 4, not Xorg. */
 #define CARDSDB "/usr/share/hwdata/Cards"
-#define XPATH "/usr/X11R6/bin/"
-#define XMODPATH "/usr/X11R6/lib/modules/drivers/"
+#define XPATH "/usr/bin/"
+#define XMODPATH "/usr/lib/xorg/modules/drivers/"
 
 #define VERBOSE_PRINT 1
 #define VERBOSE_PROMPT 2