diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 29975f678b4..f23857ad2f4 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -1174,15 +1174,30 @@
 
 	<desc name="pname">
 		<value name="GL_PACK_ALIGNMENT"/>
-		<value name="GL_UNPACK_ALIGNMENT"/>
+		<desc name="param" error="GL_INVALID_VALUE">
+			<value name="1"/>
+			<value name="2"/>
+			<value name="4"/>
+			<value name="8"/>
+		</desc>
 	</desc>
 
-	<desc name="param" error="GL_INVALID_VALUE">
-		<value name="1"/>
-		<value name="2"/>
-		<value name="4"/>
-		<value name="8"/>
+	<desc name="pname">
+		<value name="GL_UNPACK_ALIGNMENT"/>
+		<desc name="param" error="GL_INVALID_VALUE">
+			<value name="1"/>
+			<value name="2"/>
+			<value name="4"/>
+			<value name="8"/>
+		</desc>
 	</desc>
+
+	<desc name="pname" category="EXT_unpack_subimage">
+		<value name="GL_UNPACK_ROW_LENGTH"/>
+		<value name="GL_UNPACK_SKIP_PIXELS"/>
+		<value name="GL_UNPACK_SKIP_ROWS"/>
+	</desc>
+
 </template>
 
 <template name="ReadPixels" direction="get">
@@ -4132,6 +4147,7 @@
 	<category name="EXT_multi_draw_arrays"/>
 	<category name="OES_EGL_image"/>
 	<category name="OES_EGL_image_external"/>
+        <category name="EXT_unpack_subimage"/>
 
 	<category name="NV_draw_buffers"/>
 	<function name="DrawBuffersNV" template="DrawBuffers"/>
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 716673954ad..8c262af081f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -213,6 +213,7 @@ static const struct extension extension_table[] = {
    { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },
    { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },
    { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },
+   { "GL_EXT_unpack_subimage",                     o(dummy_true),                                         ES2, 2011 },
    { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },
    { "GL_EXT_vertex_array",                        o(dummy_true),                              GL,             1995 },