diff --git a/external/mit/xorg/lib/gallium/Makefile b/external/mit/xorg/lib/gallium/Makefile
index 5cd26d92ed41..a61230f8b004 100644
--- a/external/mit/xorg/lib/gallium/Makefile
+++ b/external/mit/xorg/lib/gallium/Makefile
@@ -358,6 +358,10 @@ CPPFLAGS.DRIVERrbug_context.c+=	-I${X11SRCDIR.MesaLib}/src/gallium/auxiliary
 CPPFLAGS.DRIVERrbug_context.c+=	-I${X11SRCDIR.MesaLib}/src/gallium/auxiliary/driver_rbug
 CPPFLAGS.DRIVERrbug_context.c+=	-I${X11SRCDIR.MesaLib}/src/gallium/drivers
 
+# Conflicts with r600/radeon_video.c and radeon/radeon_video.c
+BUILDSYMLINKS+=	${X11SRCDIR.MesaLib}/src/gallium/drivers/r600/radeon_video.c r600_radeon_video.c
+BUILDSYMLINKS+=	${X11SRCDIR.MesaLib}/src/gallium/drivers/radeon/radeon_video.c radeon_radeon_video.c
+
 GALLIUM_SOURCES.drivers/radeon = \
         cayman_msaa.c \
         r600_buffer_common.c \
@@ -365,7 +369,7 @@ GALLIUM_SOURCES.drivers/radeon = \
         r600_query.c \
         r600_streamout.c \
         r600_texture.c \
-        radeon_video.c \
+        radeon_radeon_video.c \
         radeon_uvd.c \
         radeon_vce.c \
         radeon_vce_40_2_2.c
@@ -385,7 +389,8 @@ GALLIUM_SOURCES.drivers/r600 = \
         r600_state_common.c \
         evergreen_compute.c \
         compute_memory_pool.c \
-        r600_uvd.c
+        r600_uvd.c \
+	r600_radeon_video.c
 GALLIUM_SOURCES.drivers/r600/sb = \
         sb_bc_builder.cpp \
         sb_bc_decoder.cpp \
@@ -620,6 +625,9 @@ CPPFLAGS+=	\
 .for _d in ${GALLIUM_SUBDIRS}
 SRCS+=	${GALLIUM_SOURCES.${_d}}
 .PATH: ${X11SRCDIR.MesaLib}/src/gallium/${_d}
+. for _s in ${GALLIUM_SOURCES.${_d}}
+CPPFLAGS.${_s}+= -I${X11SRCDIR.MesaLib}/src/gallium/${_d}
+. endfor
 .endfor
 
 #. if defined(${GALLIUM_SOURCES.${_d}})
@@ -647,6 +655,8 @@ LIBDPLIBS+= 	drm_nouveau	${.CURDIR}/../libdrm_nouveau
 LIBDPLIBS+= 	glapi		${.CURDIR}/../libglapi
 LIBDPLIBS+=	expat		${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
 
+LIBDPLIBS+=	z		${.CURDIR}/../../../../../lib/libz
+
 LLVMIRDIR!=	cd ${.CURDIR}/../../../../../external/bsd/llvm/lib; ${PRINTOBJDIR}
 
 LLVM_LIBS=	\