diff -Naur hwinfo-18.1/src/ids/src/x11.i386 hwinfo-18.1-magellan/src/ids/src/x11.i386
--- hwinfo-18.1/src/ids/src/x11.i386	2010-05-21 15:30:39.000000000 +0200
+++ hwinfo-18.1-magellan/src/ids/src/x11.i386	2010-12-09 20:06:28.000000000 +0100
@@ -172,12 +172,12 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4354
 +device.name		215CT [Mach64 CT]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4358
 +device.name		210888CX [Mach64 CX]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4437
@@ -188,7 +188,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4554
 +device.name		210888ET [Mach64 ET]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4742
@@ -204,7 +204,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4749
 +device.name		Mach64 GI
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x474c
@@ -239,28 +239,28 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4752
 +device.name		Mach64 GR
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 +driver.xfree.config	Option "XaaNoPixmapCache" "on"
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4753
 +device.name		Mach64 GS
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4754
 +device.name		3D Rage I/II 215GT [Mach64 GT]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4755
 +device.name		3D Rage II+ 215GTB [Mach64 GTB]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4756
 +device.name		3D Rage IIC 215IIC [Mach64 GT IIC]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4757
@@ -270,7 +270,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4758
 +device.name		210888GX [Mach64 GX]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4759
@@ -280,7 +280,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x475a
 +device.name		Mach64 GZ
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4966
@@ -387,7 +387,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4c42
 +device.name		Mach64 LB
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4c42
@@ -422,7 +422,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4c49
 +device.name		Mach64 LI
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4c4d
@@ -449,7 +449,7 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4c51
 +device.name		Mach64 LQ
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4c52
@@ -1190,17 +1190,17 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x5654
 +device.name		Mach64 VT
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5655
 +device.name		264VT3 [Mach64 VT3]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5656
 +device.name		264VT4 [Mach64 VT4]
-+driver.xfree		4|ati
++driver.xfree		4|mach64
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5834