diff --git a/docs/extensions.html b/docs/extensions.html
index 5d790fb6188..40f59d3b089 100644
--- a/docs/extensions.html
+++ b/docs/extensions.html
@@ -23,19 +23,27 @@ The specifications follow.
diff --git a/docs/relnotes/5.1 b/docs/relnotes/5.1
index aed6e102b09..59b7964a080 100644
--- a/docs/relnotes/5.1
+++ b/docs/relnotes/5.1
@@ -106,7 +106,7 @@ Vertex/Fragment program debugger
GL_MESA_program_debug is an experimental extension to support
interactive debugging of vertex and fragment programs. See the
-docs/MESA_program_debug.spec file for details.
+docs/specs/OLD/MESA_program_debug.spec file for details.
The bulk of the vertex/fragment program debugger is implemented
outside of Mesa. The GL_MESA_program_debug extension just has minimal
diff --git a/docs/MESA_agp_offset.spec b/docs/specs/MESA_agp_offset.spec
similarity index 100%
rename from docs/MESA_agp_offset.spec
rename to docs/specs/MESA_agp_offset.spec
diff --git a/docs/MESA_copy_sub_buffer.spec b/docs/specs/MESA_copy_sub_buffer.spec
similarity index 100%
rename from docs/MESA_copy_sub_buffer.spec
rename to docs/specs/MESA_copy_sub_buffer.spec
diff --git a/docs/MESA_drm_image.spec b/docs/specs/MESA_drm_image.spec
similarity index 100%
rename from docs/MESA_drm_image.spec
rename to docs/specs/MESA_drm_image.spec
diff --git a/docs/MESA_multithread_makecurrent.spec b/docs/specs/MESA_multithread_makecurrent.spec
similarity index 100%
rename from docs/MESA_multithread_makecurrent.spec
rename to docs/specs/MESA_multithread_makecurrent.spec
diff --git a/docs/MESA_pack_invert.spec b/docs/specs/MESA_pack_invert.spec
similarity index 100%
rename from docs/MESA_pack_invert.spec
rename to docs/specs/MESA_pack_invert.spec
diff --git a/docs/MESA_pixmap_colormap.spec b/docs/specs/MESA_pixmap_colormap.spec
similarity index 100%
rename from docs/MESA_pixmap_colormap.spec
rename to docs/specs/MESA_pixmap_colormap.spec
diff --git a/docs/MESA_release_buffers.spec b/docs/specs/MESA_release_buffers.spec
similarity index 100%
rename from docs/MESA_release_buffers.spec
rename to docs/specs/MESA_release_buffers.spec
diff --git a/docs/MESA_resize_buffers.spec b/docs/specs/MESA_resize_buffers.spec
similarity index 100%
rename from docs/MESA_resize_buffers.spec
rename to docs/specs/MESA_resize_buffers.spec
diff --git a/docs/MESA_set_3dfx_mode.spec b/docs/specs/MESA_set_3dfx_mode.spec
similarity index 100%
rename from docs/MESA_set_3dfx_mode.spec
rename to docs/specs/MESA_set_3dfx_mode.spec
diff --git a/docs/MESA_shader_debug.spec b/docs/specs/MESA_shader_debug.spec
similarity index 100%
rename from docs/MESA_shader_debug.spec
rename to docs/specs/MESA_shader_debug.spec
diff --git a/docs/MESA_swap_control.spec b/docs/specs/MESA_swap_control.spec
similarity index 100%
rename from docs/MESA_swap_control.spec
rename to docs/specs/MESA_swap_control.spec
diff --git a/docs/MESA_swap_frame_usage.spec b/docs/specs/MESA_swap_frame_usage.spec
similarity index 100%
rename from docs/MESA_swap_frame_usage.spec
rename to docs/specs/MESA_swap_frame_usage.spec
diff --git a/docs/MESA_texture_array.spec b/docs/specs/MESA_texture_array.spec
similarity index 100%
rename from docs/MESA_texture_array.spec
rename to docs/specs/MESA_texture_array.spec
diff --git a/docs/MESA_texture_signed_rgba.spec b/docs/specs/MESA_texture_signed_rgba.spec
similarity index 100%
rename from docs/MESA_texture_signed_rgba.spec
rename to docs/specs/MESA_texture_signed_rgba.spec
diff --git a/docs/MESA_window_pos.spec b/docs/specs/MESA_window_pos.spec
similarity index 100%
rename from docs/MESA_window_pos.spec
rename to docs/specs/MESA_window_pos.spec
diff --git a/docs/MESA_ycbcr_texture.spec b/docs/specs/MESA_ycbcr_texture.spec
similarity index 100%
rename from docs/MESA_ycbcr_texture.spec
rename to docs/specs/MESA_ycbcr_texture.spec
diff --git a/docs/OLD/MESA_packed_depth_stencil.spec b/docs/specs/OLD/MESA_packed_depth_stencil.spec
similarity index 100%
rename from docs/OLD/MESA_packed_depth_stencil.spec
rename to docs/specs/OLD/MESA_packed_depth_stencil.spec
diff --git a/docs/OLD/MESA_program_debug.spec b/docs/specs/OLD/MESA_program_debug.spec
similarity index 100%
rename from docs/OLD/MESA_program_debug.spec
rename to docs/specs/OLD/MESA_program_debug.spec
diff --git a/docs/OLD/MESA_sprite_point.spec b/docs/specs/OLD/MESA_sprite_point.spec
similarity index 100%
rename from docs/OLD/MESA_sprite_point.spec
rename to docs/specs/OLD/MESA_sprite_point.spec
diff --git a/docs/OLD/MESA_trace.spec b/docs/specs/OLD/MESA_trace.spec
similarity index 100%
rename from docs/OLD/MESA_trace.spec
rename to docs/specs/OLD/MESA_trace.spec
diff --git a/docs/WL_bind_wayland_display.spec b/docs/specs/WL_bind_wayland_display.spec
similarity index 100%
rename from docs/WL_bind_wayland_display.spec
rename to docs/specs/WL_bind_wayland_display.spec
diff --git a/docs/enums.txt b/docs/specs/enums.txt
similarity index 100%
rename from docs/enums.txt
rename to docs/specs/enums.txt
diff --git a/docs/xlibdriver.html b/docs/xlibdriver.html
index 6b7b02903a1..ce1ff3b132e 100644
--- a/docs/xlibdriver.html
+++ b/docs/xlibdriver.html
@@ -221,7 +221,7 @@ See the xdemos/glxpixmap.c file for an example of how to use this
extension.
-GLX_MESA_pixmap_colormap specification
+GLX_MESA_pixmap_colormap specification
@@ -250,7 +250,7 @@ just before an X window is destroyed. For example:
XDestroyWindow( dpy, window );
-GLX_MESA_release_buffers specification
+GLX_MESA_release_buffers specification
This extension was added in Mesa 2.0.
@@ -263,7 +263,7 @@ like glXSwapBuffers() but only copies a sub-region of the window
instead of the whole window.
-GLX_MESA_copy_sub_buffer specification
+GLX_MESA_copy_sub_buffer specification
This extension was added in Mesa 2.6