diff --git a/ChangeLog b/ChangeLog
index 84ca8fbb1..6f09337c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-02-06  David Reveman  <davidr@novell.com>
+
+	* GL/glx/glxscreens.c: GLX_MESA_render_texture ->
+	GLX_EXT_texture_from_pixmap.
+
+	* GL/glx/glxcmdsswap.c (__glXSwapVendorPrivate):
+	* GL/glx/glxcmds.c (__glXVendorPrivate): X_GLXvop_BindTexImageMESA ->
+	X_GLXvop_BindTexImageEXT and X_GLXvop_ReleaseTexImageMESA ->
+	X_GLXvop_ReleaseTexImageEXT.
+
+	* GL/glx/glxcmdsswap.c (__glXSwapBindTexImageEXT):
+	(__glXSwapReleaseTexImageEXT): Correct types for drawId and buffer.
+
 2006-02-02  David Reveman  <davidr@novell.com>
 
 	* GL/glx/glxscreens.c: Allow support for GL_NV_texture_env_combine4 and
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 581c16ff8..947dc149c 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -2297,9 +2297,9 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
 	return Success;
     case X_GLXvop_BindSwapBarrierSGIX:
         return __glXBindSwapBarrierSGIX(cl, pc);
-    case X_GLXvop_BindTexImageMESA:
+    case X_GLXvop_BindTexImageEXT:
       return __glXBindTexImageEXT(cl, pc);
-    case X_GLXvop_ReleaseTexImageMESA:
+    case X_GLXvop_ReleaseTexImageEXT:
       return __glXReleaseTexImageEXT(cl, pc);
     }
 #endif
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index 07814a4cb..951c4cb89 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -410,15 +410,15 @@ int __glXSwapGetDrawableAttributesSGIX(__GLXclientState *cl, char *pc)
 int __glXSwapBindTexImageEXT(__GLXclientState *cl, GLchar *pc)
 {
     xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
-    GLXDrawable		 *drawId;
-    int			 *buffer;
+    CARD32		 *drawId;
+    INT32		 *buffer;
     
     __GLX_DECLARE_SWAP_VARIABLES;
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
 
-    drawId = ((GLXDrawable *) (pc));
-    buffer = ((int *)	      (pc + 4));
+    drawId = ((CARD32 *) (pc));
+    buffer = ((INT32 *)  (pc + 4));
     
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->contextTag);
@@ -431,15 +431,15 @@ int __glXSwapBindTexImageEXT(__GLXclientState *cl, GLchar *pc)
 int __glXSwapReleaseTexImageEXT(__GLXclientState *cl, GLchar *pc)
 {
     xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
-    GLXDrawable		 *drawId;
-    int			 *buffer;
+    CARD32		 *drawId;
+    INT32		 *buffer;
     
     __GLX_DECLARE_SWAP_VARIABLES;
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
 
-    drawId = ((GLXDrawable *) (pc));
-    buffer = ((int *)	      (pc + 4));
+    drawId = ((CARD32 *) (pc));
+    buffer = ((INT32 *)  (pc + 4));
     
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->contextTag);
@@ -1083,9 +1083,9 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
 	__GLX_SWAP_INT(pc + 4);
 	CALL_SamplePatternSGIS( GET_DISPATCH(), (*(GLenum *)(pc + 4)) );
 	return Success;
-    case X_GLXvop_BindTexImageMESA:
+    case X_GLXvop_BindTexImageEXT:
 	return __glXSwapBindTexImageEXT(cl, pc);
-    case X_GLXvop_ReleaseTexImageMESA:
+    case X_GLXvop_ReleaseTexImageEXT:
 	return __glXSwapReleaseTexImageEXT(cl, pc);  
     }
 #endif
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 860009db1..26e473037 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -142,7 +142,7 @@ static char GLXServerExtensions[] =
                         "GLX_SGIX_swap_barrier "
 #endif
 			"GLX_SGIX_fbconfig "
-			"GLX_MESA_render_texture "
+			"GLX_EXT_texture_from_pixmap "
 			;
 
 /*