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 09:38:36.000000000 +0100
@@ -405,8 +405,8 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4c45
 +device.name		Rage 128 Mobility LE
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4c46
@@ -508,14 +508,14 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x4d46
 +device.name		Rage 128 Mobility MF
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4d4c
 +device.name		Rage 128 Mobility ML
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x4e44
@@ -617,146 +617,146 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x5041
 +device.name		Rage 128 PA
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5042
 +device.name		Rage 128 PB
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5043
 +device.name		Rage 128 PC
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5044
 +device.name		Rage 128 PD
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5045
 +device.name		Rage 128 PE
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5046
 +device.name		Rage 128 PF
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5047
 +device.name		Rage 128 PG
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5048
 +device.name		Rage 128 PH
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5049
 +device.name		Rage 128 PI
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x504a
 +device.name		Rage 128 PJ
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x504b
 +device.name		Rage 128 PK
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x504c
 +device.name		Rage 128 PL
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x504d
 +device.name		Rage 128 PM
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x504e
 +device.name		Rage 128 PN
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x504f
 +device.name		Rage 128 PO
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5050
 +device.name		Rage 128 PP
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5051
 +device.name		Rage 128 PQ
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5052
 +device.name		Rage 128 PR
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5053
 +device.name		Rage 128 PS
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5054
 +device.name		Rage 128 PT
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5055
 +device.name		Rage 128 PU
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5056
 +device.name		Rage 128 PV
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5057
 +device.name		Rage 128 PW
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5058
 +device.name		Rage 128 PX
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5144
@@ -948,116 +948,116 @@
  vendor.id		pci 0x1002
 &device.id		pci 0x5245
 +device.name		Rage 128 RE
-+driver.xfree		4|ati|||||8,15,16,24
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128|||||8,15,16,24
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5246
 +device.name		Rage 128 RF
-+driver.xfree		4|ati|||||8,15,16,24
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128|||||8,15,16,24
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5247
 +device.name		Rage 128 RG
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x524b
 +device.name		Rage 128 RK
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x524c
 +device.name		Rage 128 RL
-+driver.xfree		4|ati|||||8,15,16,24
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128|||||8,15,16,24
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5345
 +device.name		Rage 128 SE
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5346
 +device.name		Rage 128 SF
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5347
 +device.name		Rage 128 SG
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5348
 +device.name		Rage 128 4x
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x534b
 +device.name		Rage 128 SK
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x534c
 +device.name		Rage 128 SL
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x534d
 +device.name		Rage 128 SM
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x534e
 +device.name		Rage 128 SN
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5446
 +device.name		Rage 128 Ultra TF
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x544c
 +device.name		Rage128 TL
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5452
 +device.name		Rage 128 Pro TR (AGP)
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5453
 +device.name		Rage 128 TS
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5454
 +device.name		Rage 128 TT
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5455
 +device.name		Rage 128 TU
-+driver.xfree		4|ati
-+driver.xfree		4|ati|3d||dri||16
++driver.xfree		4|r128
++driver.xfree		4|r128|3d||dri||16
 
  vendor.id		pci 0x1002
 &device.id		pci 0x5460