Xorg 1.5 upgrade weirdness

In my quest to get DRI working on my hardened amd64 desktop machine I upgraded to Xorg-1.5. It appears that Xorg-1.5 doesn't support the XkbLayout in xorg.conf anymore instead relying on Hal for language settings. So to get Danish keyboard layout I had to add a bit of magic to /etc/hal/fdi/policy/10-x11-input.fdi:

<merge key="input.xkb.layout" type="string">dk</merge>

Also the i810 driver is now called intel...

Apart from that Xorg-1.5 appears to be working fine, though all the fancy KDE4 stuff still only work with Xrender not OpenGL.