diff --git a/radeonhd.diff b/radeonhd.diff
new file mode 100644
index 0000000..a0715d5
--- /dev/null
+++ b/radeonhd.diff
@@ -0,0 +1,21 @@
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 29b58e9..4c800e9 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -164,7 +164,15 @@ videoPtrToDriverList(struct pci_device *dev,
+ 	case 0x1142:		    driverList[0] = "apm"; break;
+ 	case 0xedd8:		    driverList[0] = "ark"; break;
+ 	case 0x1a03:		    driverList[0] = "ast"; break;
+-	case 0x1002:		    driverList[0] = "ati"; break;
++	case 0x1002:		    
++	    if (
++#include "radeonhd.h"
++               ) {
++		driverList[0] = "radeonhd";
++	    } else {
++		driverList[0] = "ati";
++	    }
++	    break;
+ 	case 0x102c:		    driverList[0] = "chips"; break;
+ 	case 0x1013:		    driverList[0] = "cirrus"; break;
+ 	case 0x3d3d:		    driverList[0] = "glint"; break;
diff --git a/radeonhd.h b/radeonhd.h
new file mode 100644
index 0000000..2087a71
--- /dev/null
+++ b/radeonhd.h
@@ -0,0 +1,205 @@
+(dev->device_id == 0x7100) ||
+(dev->device_id == 0x7101) ||
+(dev->device_id == 0x7102) ||
+(dev->device_id == 0x7103) ||
+(dev->device_id == 0x7104) ||
+(dev->device_id == 0x7105) ||
+(dev->device_id == 0x7106) ||
+(dev->device_id == 0x7108) ||
+(dev->device_id == 0x7109) ||
+(dev->device_id == 0x710a) ||
+(dev->device_id == 0x710b) ||
+(dev->device_id == 0x710c) ||
+(dev->device_id == 0x710e) ||
+(dev->device_id == 0x710f) ||
+(dev->device_id == 0x7140) ||
+(dev->device_id == 0x7141) ||
+(dev->device_id == 0x7142) ||
+(dev->device_id == 0x7143) ||
+(dev->device_id == 0x7144) ||
+(dev->device_id == 0x7145) ||
+(dev->device_id == 0x7146) ||
+(dev->device_id == 0x7147) ||
+(dev->device_id == 0x7149) ||
+(dev->device_id == 0x714a) ||
+(dev->device_id == 0x714b) ||
+(dev->device_id == 0x714c) ||
+(dev->device_id == 0x714d) ||
+(dev->device_id == 0x714e) ||
+(dev->device_id == 0x714f) ||
+(dev->device_id == 0x7151) ||
+(dev->device_id == 0x7152) ||
+(dev->device_id == 0x7153) ||
+(dev->device_id == 0x715e) ||
+(dev->device_id == 0x715f) ||
+(dev->device_id == 0x7180) ||
+(dev->device_id == 0x7181) ||
+(dev->device_id == 0x7183) ||
+(dev->device_id == 0x7186) ||
+(dev->device_id == 0x7187) ||
+(dev->device_id == 0x7188) ||
+(dev->device_id == 0x718a) ||
+(dev->device_id == 0x718b) ||
+(dev->device_id == 0x718c) ||
+(dev->device_id == 0x718d) ||
+(dev->device_id == 0x718f) ||
+(dev->device_id == 0x7193) ||
+(dev->device_id == 0x7196) ||
+(dev->device_id == 0x719b) ||
+(dev->device_id == 0x719f) ||
+(dev->device_id == 0x71c0) ||
+(dev->device_id == 0x71c1) ||
+(dev->device_id == 0x71c2) ||
+(dev->device_id == 0x71c3) ||
+(dev->device_id == 0x71c4) ||
+(dev->device_id == 0x71c5) ||
+(dev->device_id == 0x71c6) ||
+(dev->device_id == 0x71c7) ||
+(dev->device_id == 0x71cd) ||
+(dev->device_id == 0x71ce) ||
+(dev->device_id == 0x71d2) ||
+(dev->device_id == 0x71d4) ||
+(dev->device_id == 0x71d5) ||
+(dev->device_id == 0x71d6) ||
+(dev->device_id == 0x71da) ||
+(dev->device_id == 0x71de) ||
+(dev->device_id == 0x7200) ||
+(dev->device_id == 0x7210) ||
+(dev->device_id == 0x7211) ||
+(dev->device_id == 0x7240) ||
+(dev->device_id == 0x7243) ||
+(dev->device_id == 0x7244) ||
+(dev->device_id == 0x7245) ||
+(dev->device_id == 0x7246) ||
+(dev->device_id == 0x7247) ||
+(dev->device_id == 0x7248) ||
+(dev->device_id == 0x7249) ||
+(dev->device_id == 0x724a) ||
+(dev->device_id == 0x724b) ||
+(dev->device_id == 0x724c) ||
+(dev->device_id == 0x724d) ||
+(dev->device_id == 0x724e) ||
+(dev->device_id == 0x724f) ||
+(dev->device_id == 0x7280) ||
+(dev->device_id == 0x7281) ||
+(dev->device_id == 0x7283) ||
+(dev->device_id == 0x7284) ||
+(dev->device_id == 0x7287) ||
+(dev->device_id == 0x7288) ||
+(dev->device_id == 0x7289) ||
+(dev->device_id == 0x728b) ||
+(dev->device_id == 0x728c) ||
+(dev->device_id == 0x7290) ||
+(dev->device_id == 0x7291) ||
+(dev->device_id == 0x7293) ||
+(dev->device_id == 0x7297) ||
+(dev->device_id == 0x791e) ||
+(dev->device_id == 0x791f) ||
+(dev->device_id == 0x793f) ||
+(dev->device_id == 0x7941) ||
+(dev->device_id == 0x7942) ||
+(dev->device_id == 0x796c) ||
+(dev->device_id == 0x796d) ||
+(dev->device_id == 0x796e) ||
+(dev->device_id == 0x796f) ||
+(dev->device_id == 0x9400) ||
+(dev->device_id == 0x9401) ||
+(dev->device_id == 0x9402) ||
+(dev->device_id == 0x9403) ||
+(dev->device_id == 0x9405) ||
+(dev->device_id == 0x940a) ||
+(dev->device_id == 0x940b) ||
+(dev->device_id == 0x940f) ||
+(dev->device_id == 0x9440) ||
+(dev->device_id == 0x9441) ||
+(dev->device_id == 0x9442) ||
+(dev->device_id == 0x9443) ||
+(dev->device_id == 0x9444) ||
+(dev->device_id == 0x9446) ||
+(dev->device_id == 0x9447) ||
+(dev->device_id == 0x944a) ||
+(dev->device_id == 0x944b) ||
+(dev->device_id == 0x944e) ||
+(dev->device_id == 0x944f) ||
+(dev->device_id == 0x9456) ||
+(dev->device_id == 0x945a) ||
+(dev->device_id == 0x945b) ||
+(dev->device_id == 0x946a) ||
+(dev->device_id == 0x946b) ||
+(dev->device_id == 0x947a) ||
+(dev->device_id == 0x947b) ||
+(dev->device_id == 0x9480) ||
+(dev->device_id == 0x9487) ||
+(dev->device_id == 0x9488) ||
+(dev->device_id == 0x9489) ||
+(dev->device_id == 0x948f) ||
+(dev->device_id == 0x9490) ||
+(dev->device_id == 0x9498) ||
+(dev->device_id == 0x949e) ||
+(dev->device_id == 0x949f) ||
+(dev->device_id == 0x94c0) ||
+(dev->device_id == 0x94c1) ||
+(dev->device_id == 0x94c3) ||
+(dev->device_id == 0x94c4) ||
+(dev->device_id == 0x94c5) ||
+(dev->device_id == 0x94c6) ||
+(dev->device_id == 0x94c7) ||
+(dev->device_id == 0x94c8) ||
+(dev->device_id == 0x94c9) ||
+(dev->device_id == 0x94cb) ||
+(dev->device_id == 0x94cc) ||
+(dev->device_id == 0x9500) ||
+(dev->device_id == 0x9501) ||
+(dev->device_id == 0x9504) ||
+(dev->device_id == 0x9505) ||
+(dev->device_id == 0x9506) ||
+(dev->device_id == 0x9507) ||
+(dev->device_id == 0x9508) ||
+(dev->device_id == 0x9509) ||
+(dev->device_id == 0x950f) ||
+(dev->device_id == 0x9511) ||
+(dev->device_id == 0x9515) ||
+(dev->device_id == 0x9517) ||
+(dev->device_id == 0x9519) ||
+(dev->device_id == 0x9540) ||
+(dev->device_id == 0x9541) ||
+(dev->device_id == 0x9542) ||
+(dev->device_id == 0x954e) ||
+(dev->device_id == 0x954f) ||
+(dev->device_id == 0x9580) ||
+(dev->device_id == 0x9581) ||
+(dev->device_id == 0x9583) ||
+(dev->device_id == 0x9586) ||
+(dev->device_id == 0x9587) ||
+(dev->device_id == 0x9588) ||
+(dev->device_id == 0x9589) ||
+(dev->device_id == 0x958a) ||
+(dev->device_id == 0x958b) ||
+(dev->device_id == 0x958c) ||
+(dev->device_id == 0x958d) ||
+(dev->device_id == 0x958e) ||
+(dev->device_id == 0x958f) ||
+(dev->device_id == 0x9590) ||
+(dev->device_id == 0x9591) ||
+(dev->device_id == 0x9593) ||
+(dev->device_id == 0x9595) ||
+(dev->device_id == 0x9596) ||
+(dev->device_id == 0x9597) ||
+(dev->device_id == 0x9598) ||
+(dev->device_id == 0x9599) ||
+(dev->device_id == 0x959b) ||
+(dev->device_id == 0x95c0) ||
+(dev->device_id == 0x95c2) ||
+(dev->device_id == 0x95c4) ||
+(dev->device_id == 0x95c5) ||
+(dev->device_id == 0x95c6) ||
+(dev->device_id == 0x95c7) ||
+(dev->device_id == 0x95cc) ||
+(dev->device_id == 0x95cd) ||
+(dev->device_id == 0x95ce) ||
+(dev->device_id == 0x95cf) ||
+(dev->device_id == 0x9610) ||
+(dev->device_id == 0x9611) ||
+(dev->device_id == 0x9612) ||
+(dev->device_id == 0x9613) ||
+(dev->device_id == 0x9614)
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 0e10968..7222064 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Mar  8 23:35:19 CET 2009 - sndirsch@suse.de
+
+- radeonhd.diff/radeonhd.h:
+  * prefer radeonhd for autoconfig for ATI >= R500
+
+-------------------------------------------------------------------
+Sun Mar  8 03:59:17 CET 2009 - sndirsch@suse.de
+
+- added hal-devel to BuildRequires for input driver configuration
+  support via HAL, e.g. evdev 
+
 -------------------------------------------------------------------
 Wed Mar  4 13:28:06 CET 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 2522651..677d5ea 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -24,13 +24,15 @@ Name:           xorg-x11-server
 ### FIXME
 %define vnc 0
 BuildRequires:  Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
+### HAL/evdev support
+BuildRequires:  hal-devel
 %if %vnc
 BuildRequires:  libjpeg-devel
 %endif
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        30
+Release:        31
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -56,6 +58,7 @@ Source4:        xorgcfg.tar.bz2
 Source5:        modprobe.nvidia
 %endif
 Source7:        xorg-docs-1.4.tar.bz2
+Source8:        radeonhd.h
 Patch1:         fpic.diff
 Patch2:         p_default-module-path.diff
 Patch6:         pu_fixes.diff
@@ -103,6 +106,7 @@ Patch125:       0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
 Patch127:       dpms_screensaver.diff
 Patch128:       pci-legacy-mem-fallback.diff
 Patch129:       bug474071-fix1.diff
+Patch130:       radeonhd.diff
 
 %description
 This package contains the X.Org Server.
@@ -217,6 +221,8 @@ popd
 pushd hw/xfree86/os-support/bus
 %patch129 -p0
 popd
+%patch130 -p1
+cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common
 
 %build
 pushd xorg-docs-*
@@ -540,6 +546,12 @@ exit 0
 %endif
 
 %changelog
+* Sun Mar 08 2009 sndirsch@suse.de
+- radeonhd.diff/radeonhd.h:
+  * prefer radeonhd for autoconfig for ATI >= R500
+* Sun Mar 08 2009 sndirsch@suse.de
+- added hal-devel to BuildRequires for input driver configuration
+  support via HAL, e.g. evdev
 * Wed Mar 04 2009 sndirsch@suse.de
 - removed randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff;
   probably a wrong patch since this commit has been reverted right