diff --git a/distrib/sets/lists/xserver/md.amd64 b/distrib/sets/lists/xserver/md.amd64
index e47285f80bff..8c97b53fe866 100644
--- a/distrib/sets/lists/xserver/md.amd64
+++ b/distrib/sets/lists/xserver/md.amd64
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.37 2008/09/25 14:15:55 rtr Exp $
+# $NetBSD: md.amd64,v 1.38 2008/09/26 06:57:04 rtr Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/Xvfb					-unknown-	x11
@@ -442,6 +442,10 @@
 ./usr/X11R7/lib/modules/drivers/vmware_drv.so.10	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0	-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a	-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.a		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so.0		-unknown-	xorg
diff --git a/distrib/sets/lists/xserver/md.i386 b/distrib/sets/lists/xserver/md.i386
index 5d6c99cd8291..4b5e91ff1de6 100644
--- a/distrib/sets/lists/xserver/md.i386
+++ b/distrib/sets/lists/xserver/md.i386
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.51 2008/09/25 14:15:55 rtr Exp $
+# $NetBSD: md.i386,v 1.52 2008/09/26 06:57:04 rtr Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/Xvfb					-unknown-	x11
@@ -474,6 +474,10 @@
 ./usr/X11R7/lib/modules/drivers/vmware_drv.so.10	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0	-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a	-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.a		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so.0		-unknown-	xorg
diff --git a/distrib/sets/lists/xserver/md.macppc b/distrib/sets/lists/xserver/md.macppc
index 070e4642f5b2..3afea98ca434 100644
--- a/distrib/sets/lists/xserver/md.macppc
+++ b/distrib/sets/lists/xserver/md.macppc
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.39 2008/09/25 14:15:55 rtr Exp $
+# $NetBSD: md.macppc,v 1.40 2008/09/26 06:57:04 rtr Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/Xmacppc					-unknown-	x11
@@ -396,6 +396,10 @@
 ./usr/X11R7/lib/modules/drivers/vmware_drv.so.10	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0	-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a	-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.a		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so.0		-unknown-	xorg
diff --git a/distrib/sets/lists/xserver/md.netwinder b/distrib/sets/lists/xserver/md.netwinder
index 948acd85c7ce..3e87186bdeee 100644
--- a/distrib/sets/lists/xserver/md.netwinder
+++ b/distrib/sets/lists/xserver/md.netwinder
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.9 2008/09/25 14:06:52 rtr Exp $
+# $NetBSD: md.netwinder,v 1.10 2008/09/26 06:57:04 rtr Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/Xvfb					-unknown-	x11
@@ -467,6 +467,10 @@
 ./usr/X11R7/lib/modules/drivers/vmware_drv.so.10	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0	-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a	-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.a		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so.0		-unknown-	xorg
diff --git a/distrib/sets/lists/xserver/md.sgimips b/distrib/sets/lists/xserver/md.sgimips
index 7007698bd707..58ffb12c871f 100644
--- a/distrib/sets/lists/xserver/md.sgimips
+++ b/distrib/sets/lists/xserver/md.sgimips
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.22 2008/09/25 14:15:55 rtr Exp $	x11
+# $NetBSD: md.sgimips,v 1.23 2008/09/26 06:57:04 rtr Exp $	x11
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/Xprt					-unknown-	x11
@@ -400,6 +400,10 @@
 ./usr/X11R7/lib/X11/doc/README.DRI			-unknown-	xorg
 ./usr/X11R7/lib/X11/doc/README.fonts			-unknown-	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0	-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a	-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libglx.a		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libglx.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libglx.so.0		-unknown-	xorg
diff --git a/distrib/sets/lists/xserver/md.shark b/distrib/sets/lists/xserver/md.shark
index 0fe784ae084e..0573212c4302 100644
--- a/distrib/sets/lists/xserver/md.shark
+++ b/distrib/sets/lists/xserver/md.shark
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.19 2008/09/25 14:15:55 rtr Exp $
+# $NetBSD: md.shark,v 1.20 2008/09/26 06:57:04 rtr Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/Xvfb					-unknown-	x11
@@ -434,6 +434,10 @@
 ./usr/X11R7/lib/modules/drivers/vmware_drv.so.10	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so		-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0	-unknown-	xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a	-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.a		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/extensions/libcfb.so.0		-unknown-	xorg
diff --git a/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile b/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile
new file mode 100644
index 000000000000..99090a5de9bf
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.1 2008/09/26 06:57:03 rtr Exp $
+
+LIBISPRIVATE=yes
+
+.include "../../Makefile.serverlib"
+
+LIB=	GLcore
+SRCS=	${SRCS.GLcore}
+
+.include "Makefile.GLcore"
diff --git a/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore b/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
new file mode 100644
index 000000000000..e3ddf026cd20
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
@@ -0,0 +1,241 @@
+#	$NetBSD: Makefile.GLcore,v 1.1 2008/09/26 06:57:03 rtr Exp $
+
+SRCS.GLcore= \
+	${SRCS.main} \
+	${SRCS.math} \
+	${SRCS.swrast} \
+	${SRCS.swrast_setup} \
+	${SRCS.tnl} \
+	${SRCS.shader} \
+	${SRCS.grammar} \
+	${SRCS.slang} \
+	${SRCS.vbo} \
+	${SRCS.X}
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/main
+SRCS.main= \
+	accum.c \
+	api_arrayelt.c \
+	api_loopback.c \
+	api_noop.c \
+	api_validate.c \
+	arrayobj.c \
+	attrib.c \
+	blend.c \
+	bufferobj.c \
+	buffers.c \
+	clip.c \
+	colortab.c \
+	context.c \
+	convolve.c \
+	debug.c \
+	depth.c \
+	depthstencil.c \
+	dlist.c \
+	drawpix.c \
+	enable.c \
+	enums.c \
+	eval.c \
+	execmem.c \
+	extensions.c \
+	fbobject.c \
+	feedback.c \
+	fog.c \
+	framebuffer.c \
+	get.c \
+	getstring.c \
+	hash.c \
+	hint.c \
+	histogram.c \
+	image.c \
+	imports.c \
+	light.c \
+	lines.c \
+	matrix.c \
+	mipmap.c \
+	mm.c \
+	pixel.c \
+	points.c \
+	polygon.c \
+	queryobj.c \
+	rastpos.c \
+	rbadaptors.c \
+	renderbuffer.c \
+	shaders.c \
+	state.c \
+	stencil.c \
+	texcompress.c \
+	texcompress_fxt1.c \
+	texcompress_s3tc.c \
+	texenvprogram.c \
+	texformat.c \
+	teximage.c \
+	texobj.c \
+	texrender.c \
+	texstate.c \
+	texstore.c \
+	varray.c \
+	vtxfmt.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/math
+SRCS.math= \
+	m_debug_clip.c \
+	m_debug_norm.c \
+	m_debug_xform.c \
+	m_eval.c \
+	m_matrix.c \
+	m_translate.c \
+	m_vector.c \
+	m_xform.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/swrast
+SRCS.swrast= \
+	s_aaline.c \
+	s_aatriangle.c \
+	s_accum.c \
+	s_alpha.c \
+	s_atifragshader.c \
+	s_bitmap.c \
+	s_blend.c \
+	s_blit.c \
+	s_buffers.c \
+	s_context.c \
+	s_copypix.c \
+	s_depth.c \
+	s_drawpix.c \
+	s_feedback.c \
+	s_fog.c \
+	s_fragprog.c \
+	s_imaging.c \
+	s_lines.c \
+	s_logic.c \
+	s_masking.c \
+	s_points.c \
+	s_readpix.c \
+	s_span.c \
+	s_stencil.c \
+	s_texcombine.c \
+	s_texfilter.c \
+	s_texstore.c \
+	s_triangle.c \
+	s_zoom.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/swrast_setup
+SRCS.swrast_setup= \
+	ss_context.c \
+	ss_triangle.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/tnl
+SRCS.tnl= \
+	t_context.c \
+	t_draw.c \
+	t_pipeline.c \
+	t_vb_cull.c \
+	t_vb_fog.c \
+	t_vb_light.c \
+	t_vb_normals.c \
+	t_vb_points.c \
+	t_vb_program.c \
+	t_vb_render.c \
+	t_vb_texgen.c \
+	t_vb_texmat.c \
+	t_vb_vertex.c \
+	t_vertex.c \
+	t_vertex_generic.c \
+	t_vertex_sse.c \
+	t_vp_build.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/shader
+SRCS.shader= \
+	arbprogparse.c \
+	arbprogram.c \
+	atifragshader.c \
+	nvfragparse.c \
+	nvprogram.c \
+	nvvertparse.c \
+	prog_debug.c \
+	prog_execute.c \
+	prog_instruction.c \
+	prog_parameter.c \
+	prog_print.c \
+	prog_statevars.c \
+	program.c \
+	programopt.c \
+	shader_api.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/shader/grammar
+SRCS.grammar= \
+	grammar_mesa.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/shader/slang
+SRCS.slang= \
+	slang_builtin.c \
+	slang_codegen.c \
+	slang_compile.c \
+	slang_compile_function.c \
+	slang_compile_operation.c \
+	slang_compile_struct.c \
+	slang_compile_variable.c \
+	slang_emit.c \
+	slang_ir.c \
+	slang_label.c \
+	slang_library_noise.c \
+	slang_link.c \
+	slang_log.c \
+	slang_mem.c \
+	slang_preprocess.c \
+	slang_print.c \
+	slang_simplify.c \
+	slang_storage.c \
+	slang_typeinfo.c \
+	slang_utility.c \
+	slang_vartable.c
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/vbo
+SRCS.vbo= \
+	vbo_context.c \
+	vbo_exec.c \
+	vbo_exec_api.c \
+	vbo_exec_array.c \
+	vbo_exec_draw.c \
+	vbo_exec_eval.c \
+	vbo_rebase.c \
+	vbo_save.c \
+	vbo_save_api.c \
+	vbo_save_draw.c \
+	vbo_save_loopback.c \
+	vbo_split.c \
+	vbo_split_copy.c \
+	vbo_split_inplace.c
+
+COPTS.vbo_save_draw.c=	-Wno-error
+
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/drivers/common
+.PATH:	${X11SRCDIR.MesaLib}/src/mesa/drivers/x11
+SRCS.X= \
+	driverfuncs.c \
+	xm_api.c \
+	xm_buffer.c \
+	xm_dd.c \
+	xm_image.c \
+	xm_line.c \
+	xm_span.c \
+	xm_tri.c
+
+CPPFLAGS+= \
+	-I${DESTDIR}${X11INCDIR}/pixman-1 \
+	-I${DESTDIR}${X11INCDIR}/xorg \
+	-I${X11SRCDIR.MesaLib}/src/mesa \
+	-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
+	-I${X11SRCDIR.MesaLib}/src/mesa/main \
+	-I${X11SRCDIR.MesaLib}/src/mesa/shader \
+	-I${X11SRCDIR.MesaLib}/src/mesa/shader/grammar \
+	-I${X11SRCDIR.MesaLib}/src/mesa/shader/slang \
+	-I${X11SRCDIR.xorg-server}/include
+
+CPPFLAGS+= \
+	${X11FLAGS.DIX}
+
+.include <bsd.x11.mk>
+LIBDIR=	${XMODULEDIR}
+.include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/GL/Makefile b/external/mit/xorg/server/xorg-server/GL/Makefile
index 3935c22bb19f..fc95b2f564a7 100644
--- a/external/mit/xorg/server/xorg-server/GL/Makefile
+++ b/external/mit/xorg/server/xorg-server/GL/Makefile
@@ -1,11 +1,7 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/03 22:11:10 mrg Exp $
-
-SUBDIR=	glx
+#	$NetBSD: Makefile,v 1.2 2008/09/26 06:57:03 rtr Exp $
 
 .include <bsd.own.mk>
 
-#.if ${X11DRI} != "no"
-#SUBDIR+=	dri
-#.endif
+SUBDIR=	GLcore glx
 
 .include <bsd.subdir.mk>
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile
new file mode 100644
index 000000000000..0108bf037807
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1 2008/09/26 06:57:03 rtr Exp $
+
+XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
+
+.include "../../../../Makefile.serverlib"
+.include "../../../../Makefile.servermod"
+
+LIB=	GLcore
+
+.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
+SRCS=	${SRCS.GLcore} GLcoremodule.c
+
+.include "../../../../GL/GLcore/Makefile.GLcore"
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
index 66ceb92e4b43..59d9642b2a7c 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/09/25 14:15:06 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2008/09/26 06:57:03 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -8,16 +8,18 @@ LIB=	dixmods
 .PATH:	${X11SRCDIR.xorg-server}/mi
 SRCS=	miinitext.c
 
-CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-		-I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
-		-I${X11SRCDIR.xorg-server}/Xext \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg
+CPPFLAGS+= \
+	-I${DESTDIR}${X11INCDIR}/X11 \
+	-I${DESTDIR}${X11INCDIR}/pixman-1 \
+	-I${DESTDIR}${X11INCDIR}/xorg \
+	-I${X11SRCDIR.xorg-server}/Xext \
+	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
+	-I${X11SRCDIR.xorg-server}/hw/xfree86/loader
 
 CPPFLAGS+=	-DXFree86LOADER
 
 SUBDIR = \
+	GLcore \
 	afb \
 	cfb \
 	cfb32 \