diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c
index 85fe5a7ef6..b6110727e9 100644
--- a/src/mesa/state_tracker/st_cb_strings.c
+++ b/src/mesa/state_tracker/st_cb_strings.c
@@ -39,6 +39,8 @@
 #include "st_context.h"
 #include "st_cb_strings.h"
 
+#define ST_VERSION_STRING "0.4"
+
 static const GLubyte *
 st_get_string(struct gl_context * ctx, GLenum name)
 {
@@ -51,7 +53,11 @@ st_get_string(struct gl_context * ctx, GLenum name)
    }
 
    case GL_RENDERER:
-      return (GLubyte *) screen->get_name(screen);
+      util_snprintf(st->renderer, sizeof(st->renderer), "Gallium %s on %s", 
+               ST_VERSION_STRING,
+	       screen->get_name( screen ));
+
+      return (GLubyte *) st->renderer;
 
    default:
       return NULL;
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 9f33eed8f3..19db15b724 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -165,6 +165,9 @@ struct st_context
       GLuint fb_orientation;
    } state;
 
+   char vendor[100];
+   char renderer[100];
+
    uint64_t dirty; /**< dirty states */
 
    /** This masks out unused shader resources. Only valid in draw calls. */