--- ./src/mesa/drivers/dri/r600/r600_context.c.org	2010-07-23 18:18:01.000000000 +0200
+++ ./src/mesa/drivers/dri/r600/r600_context.c	2010-07-23 19:24:24.000000000 +0200
@@ -334,12 +334,22 @@
 
 	if (r600->radeon.glCtx->Mesa_DXTn
 	    && !driQueryOptionb(&r600->radeon.optionCache, "disable_s3tc")) {
+	    /* R600 currently cannot handle compressed textures, never enable them.  */
+#if 0
 		_mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
+#else
+		fprintf(stderr, "DXTn available but R600 does not support s3tc compressed textures yet (ignored).\n");
+#endif
 		_mesa_enable_extension(ctx, "GL_S3_s3tc");
 	} else
 	    if (driQueryOptionb(&r600->radeon.optionCache, "force_s3tc_enable"))
 	{
+            /* R600 currently cannot handle compressed textures, never enable them.  */
+#if 0
 		_mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
+#else
+		fprintf(stderr, "force_s3tc_enable specified but R600 does not support s3tc compressed textures yet (ignored).\n");
+#endif
 	}
 
 	/* RV740 had a broken pipe config prior to drm 1.32 */