diff --git a/docs/VERSIONS b/docs/VERSIONS
index 7befd67d37e..2b4ab627366 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.69 2001/08/28 22:53:44 brianp Exp $
+$Id: VERSIONS,v 1.70 2001/08/28 23:12:37 brianp Exp $
 
 
 Mesa Version History
@@ -875,6 +875,8 @@ Mesa Version History
 	- GL_EXT_texture_edge_clamp extension (aka GL_SGIS_texture_edge_clamp)
 	- WindML UGL driver (Stephane Raimbault)
 	- initial support for OpenGL 1.3
+	- added OSMESA_MAX_WIDTH/HEIGHT queries
+	- attempted compiliation fixes for Solaris 5, 7 and 8
     Bug fixes:
 	- added some missing GLX 1.3 tokens to include/GL/glx.h
 	- GL_COLOR_MATRIX changes weren't recognized by teximage functions
diff --git a/include/GL/osmesa.h b/include/GL/osmesa.h
index 0e4a10b2f8b..a002dcdacba 100644
--- a/include/GL/osmesa.h
+++ b/include/GL/osmesa.h
@@ -1,10 +1,10 @@
-/* $Id: osmesa.h,v 1.7 2001/06/27 13:56:17 brianp Exp $ */
+/* $Id: osmesa.h,v 1.8 2001/08/28 23:12:37 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  3.5.1
  * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -64,6 +64,7 @@ extern "C" {
 
 #define OSMESA_MAJOR_VERSION 3
 #define OSMESA_MINOR_VERSION 5
+#define OSMESA_PATCH_VERSION 1
 
 
 
@@ -95,6 +96,8 @@ extern "C" {
 #define OSMESA_HEIGHT		0x21
 #define OSMESA_FORMAT		0x22
 #define OSMESA_TYPE		0x23
+#define OSMESA_MAX_WIDTH	0x24  /* new in 3.5.1 */
+#define OSMESA_MAX_HEIGHT	0x25  /* new in 3.5.1 */
 
 
 typedef struct osmesa_context *OSMesaContext;
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 42de21641ac..1ca21486be6 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.64 2001/08/28 22:46:22 brianp Exp $ */
+/* $Id: osmesa.c,v 1.65 2001/08/28 23:12:37 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -553,6 +553,12 @@ void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value )
       case OSMESA_Y_UP:
          *value = ctx->yup;
          return;
+      case OSMESA_MAX_WIDTH:
+         *value = MAX_WIDTH;
+         return;
+      case OSMESA_MAX_HEIGHT:
+         *value = MAX_HEIGHT;
+         return;
       default:
          _mesa_error(&ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");
          return;