diff --git a/contrib/sdk/sources/Mesa/src/mapi/Makefile b/contrib/sdk/sources/Mesa/src/mapi/Makefile
index d0761e0215..3abc35250e 100644
--- a/contrib/sdk/sources/Mesa/src/mapi/Makefile
+++ b/contrib/sdk/sources/Mesa/src/mapi/Makefile
@@ -53,6 +53,6 @@ libGL.dll: $(LIBGL_OBJS) Makefile
 	$(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $<
 
 %.o : %.S Makefile
-	$(CC) -c -save-temps -U_WIN32 -I $(MESA_SRC)/mesa -o $@ $<
+	$(CC) -c -U_WIN32 -I $(MESA_SRC)/mesa -o $@ $<
 
  
\ No newline at end of file
diff --git a/contrib/sdk/sources/Mesa/src/mesa/Makefile b/contrib/sdk/sources/Mesa/src/mesa/Makefile
index c957ebfed7..eb124b8f03 100644
--- a/contrib/sdk/sources/Mesa/src/mesa/Makefile
+++ b/contrib/sdk/sources/Mesa/src/mesa/Makefile
@@ -4,7 +4,7 @@ SRC_DIR:=$(SDK_DIR)/sources
 MESA_SRC:= $(SRC_DIR)/Mesa/src
 
 CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os
-CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields -save-temps
+CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields
 CFLAGS   = -c $(CFLAGS_OPT)
 
 LD = ld
@@ -388,7 +388,7 @@ i965_dri.drv: $(I965_OBJS) $(MESA_OBJS) dri.def Makefile
 	$(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $<
 
 %.o : %.S Makefile
-	$(CC) -c -save-temps -U_WIN32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -I $(MESA_SRC)/mesa -o $@ $<
+	$(CC) -c -U_WIN32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -I $(MESA_SRC)/mesa -o $@ $<
 
 %.o : %.cpp Makefile
 	$(CC) $(CFLAGS) $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $<
diff --git a/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c b/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c
index 43c802b2c0..b37d81c402 100644
--- a/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -47,6 +47,7 @@ translate_texture_format(gl_format mesa_format, GLenum DepthMode)
    case MESA_FORMAT_I8:
       return MAPSURF_8BIT | MT_8BIT_I8;
    case MESA_FORMAT_A8:
+   case MESA_FORMAT_R8:
       return MAPSURF_8BIT | MT_8BIT_A8;
    case MESA_FORMAT_AL88:
       return MAPSURF_16BIT | MT_16BIT_AY88;
diff --git a/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_context.c b/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_context.c
index f27e3d084a..7d4614685d 100644
--- a/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_context.c
+++ b/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_context.c
@@ -69,6 +69,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
    const struct intel_context *const intel = intel_context(ctx);
    const char *chipset;
    static char buffer[128];
+   static char driver_name[] = "i915_dri.drv";
 
    switch (name) {
    case GL_VENDOR:
@@ -88,6 +89,9 @@ intelGetString(struct gl_context * ctx, GLenum name)
       (void) driGetRendererString(buffer, chipset, 0);
       return (GLubyte *) buffer;
 
+   case 0x1F04:  /* GL_DRIVER_NAME */
+      return (GLubyte*)driver_name;
+
    default:
       return NULL;
    }
diff --git a/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c b/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
index 8c0668c43b..50b8b293c2 100644
--- a/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
@@ -1111,6 +1111,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
 {
    struct intel_screen *intelScreen;
 
+   printf("mesa-9.2.5-i915_dri build %s %s\n", __DATE__, __TIME__);
+
    if (psp->dri2.loader->base.version <= 2 ||
        psp->dri2.loader->getBuffersWithFormat == NULL) {
       fprintf(stderr,