25 files changed, 25 insertions, 17 deletions
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.
 
 
 <ul>
-<li><a href="MESA_agp_offset.spec">MESA_agp_offset.spec</a>
-<li><a href="MESA_copy_sub_buffer.spec">MESA_copy_sub_buffer.spec</a>
-<li><a href="MESA_packed_depth_stencil.spec">MESA_packed_depth_stencil.spec</a>
-<li><a href="MESA_pack_invert.spec">MESA_pack_invert.spec</a>
-<li><a href="MESA_pixmap_colormap.spec">MESA_pixmap_colormap.spec</a>
-<li><a href="MESA_release_buffers.spec">MESA_release_buffers.spec</a>
-<li><a href="MESA_resize_buffers.spec">MESA_resize_buffers.spec</a>
-<li><a href="MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</a>
-<li><a href="MESA_sprite_point.spec">MESA_sprite_point.spec</a> (obsolete)
-<li><a href="MESA_texture_signed_rgba.spec">MESA_texture_signed_rgba.spec</a>
-<li><a href="MESA_trace.spec">MESA_trace.spec</a> (obsolete)
-<li><a href="MESA_window_pos.spec">MESA_window_pos.spec</a>
-<li><a href="MESA_ycbcr_texture.spec">MESA_ycbcr_texture.spec</a>
+<li><a href="specs/MESA_agp_offset.spec">MESA_agp_offset.spec</a>
+<li><a href="specs/MESA_copy_sub_buffer.spec">MESA_copy_sub_buffer.spec</a>
+<li><a href="specs/MESA_drm_image.spec">MESA_drm_image.spec</a>
+<li><a href="specs/MESA_multithread_makecurrent.spec">MESA_multithread_makecurrent.spec</a>
+<li><a href="specs/OLD/MESA_packed_depth_stencil.spec">MESA_packed_depth_stencil.spec</a> (obsolete)
+<li><a href="specs/MESA_pack_invert.spec">MESA_pack_invert.spec</a>
+<li><a href="specs/MESA_pixmap_colormap.spec">MESA_pixmap_colormap.spec</a>
+<li><a href="specs/OLD/MESA_program_debug.spec">MESA_program_debug.spec</a> (obsolete)
+<li><a href="specs/MESA_release_buffers.spec">MESA_release_buffers.spec</a>
+<li><a href="specs/MESA_resize_buffers.spec">MESA_resize_buffers.spec</a>
+<li><a href="specs/MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</a>
+<li><a href="specs/MESA_shader_debug.spec">MESA_shader_debug.spec</a>
+<li><a href="specs/OLD/MESA_sprite_point.spec">MESA_sprite_point.spec</a> (obsolete)
+<li><a href="specs/MESA_swap_control.spec">MESA_swap_control.spec</a>
+<li><a href="specs/MESA_swap_frame_usage.spec">MESA_swap_frame_usage.spec</a>
+<li><a href="specs/MESA_texture_array.spec">MESA_texture_array.spec</a>
+<li><a href="specs/MESA_texture_signed_rgba.spec">MESA_texture_signed_rgba.spec</a>
+<li><a href="specs/OLD/MESA_trace.spec">MESA_trace.spec</a> (obsolete)
+<li><a href="specs/MESA_window_pos.spec">MESA_window_pos.spec</a>
+<li><a href="specs/MESA_ycbcr_texture.spec">MESA_ycbcr_texture.spec</a>
+<li><a href="specs/WL_bind_wayland_display.spec">WL_bind_wayland_display.spec</a>
 </ul>
 
 </div>
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
index 06e1d902edd..06e1d902edd 100644
--- a/docs/MESA_agp_offset.spec
+++ b/docs/specs/MESA_agp_offset.spec
diff --git a/docs/MESA_copy_sub_buffer.spec b/docs/specs/MESA_copy_sub_buffer.spec
index 752a014b352..752a014b352 100644
--- a/docs/MESA_copy_sub_buffer.spec
+++ b/docs/specs/MESA_copy_sub_buffer.spec
diff --git a/docs/MESA_drm_image.spec b/docs/specs/MESA_drm_image.spec
index 1150a4c43e4..1150a4c43e4 100644
--- a/docs/MESA_drm_image.spec
+++ b/docs/specs/MESA_drm_image.spec
diff --git a/docs/MESA_multithread_makecurrent.spec b/docs/specs/MESA_multithread_makecurrent.spec
index 5065c2fc0a3..5065c2fc0a3 100644
--- a/docs/MESA_multithread_makecurrent.spec
+++ b/docs/specs/MESA_multithread_makecurrent.spec
diff --git a/docs/MESA_pack_invert.spec b/docs/specs/MESA_pack_invert.spec
index 33fb3c7bf80..33fb3c7bf80 100644
--- a/docs/MESA_pack_invert.spec
+++ b/docs/specs/MESA_pack_invert.spec
diff --git a/docs/MESA_pixmap_colormap.spec b/docs/specs/MESA_pixmap_colormap.spec
index fb0b441cc58..fb0b441cc58 100644
--- a/docs/MESA_pixmap_colormap.spec
+++ b/docs/specs/MESA_pixmap_colormap.spec
diff --git a/docs/MESA_release_buffers.spec b/docs/specs/MESA_release_buffers.spec
index 52d1e5a9c7c..52d1e5a9c7c 100644
--- a/docs/MESA_release_buffers.spec
+++ b/docs/specs/MESA_release_buffers.spec
diff --git a/docs/MESA_resize_buffers.spec b/docs/specs/MESA_resize_buffers.spec
index dabc7c421da..dabc7c421da 100644
--- a/docs/MESA_resize_buffers.spec
+++ b/docs/specs/MESA_resize_buffers.spec
diff --git a/docs/MESA_set_3dfx_mode.spec b/docs/specs/MESA_set_3dfx_mode.spec
index 06d97ca021f..06d97ca021f 100644
--- a/docs/MESA_set_3dfx_mode.spec
+++ b/docs/specs/MESA_set_3dfx_mode.spec
diff --git a/docs/MESA_shader_debug.spec b/docs/specs/MESA_shader_debug.spec
index fab92abc762..fab92abc762 100644
--- a/docs/MESA_shader_debug.spec
+++ b/docs/specs/MESA_shader_debug.spec
diff --git a/docs/MESA_swap_control.spec b/docs/specs/MESA_swap_control.spec
index a002563c9dc..a002563c9dc 100644
--- a/docs/MESA_swap_control.spec
+++ b/docs/specs/MESA_swap_control.spec
diff --git a/docs/MESA_swap_frame_usage.spec b/docs/specs/MESA_swap_frame_usage.spec
index 5023eadd8a1..5023eadd8a1 100644
--- a/docs/MESA_swap_frame_usage.spec
+++ b/docs/specs/MESA_swap_frame_usage.spec
diff --git a/docs/MESA_texture_array.spec b/docs/specs/MESA_texture_array.spec
index b146821f72e..b146821f72e 100644
--- a/docs/MESA_texture_array.spec
+++ b/docs/specs/MESA_texture_array.spec
diff --git a/docs/MESA_texture_signed_rgba.spec b/docs/specs/MESA_texture_signed_rgba.spec
index e3a6b59afac..e3a6b59afac 100644
--- a/docs/MESA_texture_signed_rgba.spec
+++ b/docs/specs/MESA_texture_signed_rgba.spec
diff --git a/docs/MESA_window_pos.spec b/docs/specs/MESA_window_pos.spec
index 9e81e9c4db4..9e81e9c4db4 100644
--- a/docs/MESA_window_pos.spec
+++ b/docs/specs/MESA_window_pos.spec
diff --git a/docs/MESA_ycbcr_texture.spec b/docs/specs/MESA_ycbcr_texture.spec
index 6a730e81ccf..6a730e81ccf 100644
--- a/docs/MESA_ycbcr_texture.spec
+++ b/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
index 112b730ecc2..112b730ecc2 100644
--- a/docs/OLD/MESA_packed_depth_stencil.spec
+++ b/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
index 7694fdcc425..7694fdcc425 100644
--- a/docs/OLD/MESA_program_debug.spec
+++ b/docs/specs/OLD/MESA_program_debug.spec
diff --git a/docs/OLD/MESA_sprite_point.spec b/docs/specs/OLD/MESA_sprite_point.spec
index b50d78e9e7b..b50d78e9e7b 100644
--- a/docs/OLD/MESA_sprite_point.spec
+++ b/docs/specs/OLD/MESA_sprite_point.spec
diff --git a/docs/OLD/MESA_trace.spec b/docs/specs/OLD/MESA_trace.spec
index dc4166e6b6e..dc4166e6b6e 100644
--- a/docs/OLD/MESA_trace.spec
+++ b/docs/specs/OLD/MESA_trace.spec
diff --git a/docs/WL_bind_wayland_display.spec b/docs/specs/WL_bind_wayland_display.spec
index 02bd6ea2112..02bd6ea2112 100644
--- a/docs/WL_bind_wayland_display.spec
+++ b/docs/specs/WL_bind_wayland_display.spec
diff --git a/docs/enums.txt b/docs/specs/enums.txt
index b37768e2027..b37768e2027 100644
--- a/docs/enums.txt
+++ b/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.
 </p>
 <p>
-<a href="MESA_pixmap_colormap.spec">GLX_MESA_pixmap_colormap specification</a>
+<a href="specs/MESA_pixmap_colormap.spec">GLX_MESA_pixmap_colormap specification</a>
 </p>
 
 
@@ -250,7 +250,7 @@ just before an X window is destroyed.  For example:
          XDestroyWindow( dpy, window );
 </pre>
 <p>
-<a href="MESA_release_buffers.spec">GLX_MESA_release_buffers specification</a>
+<a href="specs/MESA_release_buffers.spec">GLX_MESA_release_buffers specification</a>
 </p>
 <p>
 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.
 </p>
 <p>
-<a href="MESA_copy_sub_buffer.spec">GLX_MESA_copy_sub_buffer specification</a>
+<a href="specs/MESA_copy_sub_buffer.spec">GLX_MESA_copy_sub_buffer specification</a>
 </p>
 <p>
 This extension was added in Mesa 2.6