diff --git a/.cvsignore b/.cvsignore
index de64fb2..bbcbe99 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 xf86-video-ati-20090929.tar.xz
 radeon-rlc-firmware-1.tar.bz2
+xf86-video-ati-20091221.tar.xz
diff --git a/sources b/sources
index 74efca2..e1ff017 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz
 189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2
+84236a984ca7d78c7a33655e54c26e4c  xf86-video-ati-20091221.tar.xz
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 5b05adc..79fbfd1 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -1,8 +1,8 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20091201
-%define gitversion 88a50a30d
+%define gitdate 20091221
+%define gitversion 4b05c47ac
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
@@ -19,7 +19,6 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 Source1:    mkxinf
 Source2:    radeon-rlc-firmware-1.tar.bz2
 
-Patch2:     radeon-ums-displayport.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -29,14 +28,14 @@ ExcludeArch: s390 s390x
 BuildRequires: python
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: mesa-libGL-devel >= 6.4-4
-BuildRequires: libdrm-devel >= 2.4.16-0.1
+BuildRequires: libdrm-devel >= 2.4.17-0.1
 BuildRequires: kernel-headers >= 2.6.27-0.308
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
-Requires:  libdrm >= 2.4.16-0.1
+Requires:  libdrm >= 2.4.17-0.1
 # new CS method needs newer kernel
 Requires:  kernel >= 2.6.29.1-111.fc11
 Obsoletes: xorg-x11-drv-avivo <= 0.0.2
@@ -52,7 +51,6 @@ Firmware for ATI R600/R700 IRQs
 
 %prep
 %setup -q -n %{tarball}-%{gitdate} -a 2
-%patch2 -p1 -b .dp
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -97,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/radeon/*.bin
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied@redhat.com> 6.13.0-0.18.20091221git4b05c47ac
+- rebase for latest libdrm_radeon API changes - should be final API.
+
 * Wed Dec 02 2009 Dave Airlie <airlied@redhat.com> 6.13.0-0.18.20091201git88a50a30d
 - add R600 RLC firmware for IRQ handling