diff --git a/srcpkgs/MesaLib/libOSMesa.template b/srcpkgs/MesaLib/libOSMesa.template
new file mode 100644
index 00000000000..c5bc4b92abe
--- /dev/null
+++ b/srcpkgs/MesaLib/libOSMesa.template
@@ -0,0 +1,15 @@
+# Template file for 'libOSMesa'.
+#
+short_desc="Mesa Off-Screen interface library"
+long_desc="
+ Mesa's off-screen rendering interface is used for rendering into user-allocated
+ blocks of memory. That is, the GL_FRONT colorbuffer is actually a buffer in
+ main memory, rather than a window on your display. There are no window system
+ or operating system dependencies. One potential application is to use Mesa as
+ an off-line, batch-style renderer."
+
+replaces="MesaLib<7.11_2"
+
+do_install() {
+	vmove "usr/lib/libOSMesa.so*" usr/lib
+}
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 8404c167151..58c784efca8 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,14 +1,15 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=8.0.4
-revision=1
+revision=2
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
 --enable-shared-dricore --enable-gles1 --enable-gles2 --enable-openvg
 --enable-egl --with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-xa
 --enable-gallium-egl --disable-va --enable-vdpau --enable-xvmc --enable-xa
---enable-texture-float --with-gallium-drivers=i915,r300,r600,svga,swrast
+--enable-texture-float --enable-osmesa
+--with-gallium-drivers=i915,r300,r600,svga,swrast
 --with-dri-drivers=i915,i965,r200,radeon,swrast"
 makedepends="perl>=0 flex pkg-config glproto dri2proto>=2.1 makedepend
 libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel