diff --git a/docs/RELNOTES-6.2.1 b/docs/RELNOTES-6.2.1
new file mode 100644
index 00000000000..d72560e5af2
--- /dev/null
+++ b/docs/RELNOTES-6.2.1
@@ -0,0 +1,50 @@
+
+                           Mesa 6.2.1 release notes
+
+                              December 9, 2004
+
+                              PLEASE READ!!!!
+
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.1) designate new developmental releases.
+Even numbered versions (such as 6.2.x) designate stable releases.
+
+
+This release primarily just fixes bugs found in the Mesa 6.2 release.
+See the VERSIONS file for details.
+
+
+
+Known Issues
+------------
+
+The GL_EXT_pixel_buffer_object extension isn't fully implemented for
+functions like glPolygonStipple, glConvolutionFilter, glColorTable,
+etc.  The important functions like glRead/DrawPixels, glTex[Sub]Image,
+and glBitmap work with PBOs.  This has been fixed for Mesa 6.3.
+
+
+
+
+Driver			Status
+----------------------	---------------------
+XMesa (Xlib)		implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			implements OpenGL 1.3
+Wind River UGL		implements OpenGL 1.3
+Windows/Win32		implements OpenGL 1.5
+DJGPP			implements OpenGL 1.5
+GGI			implements OpenGL 1.3
+BeOS			implements OpenGL 1.5
+Allegro			needs updating
+D3D			needs updating
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-6.2.1,v 3.1 2004/12/09 23:21:36 brianp Exp $
diff --git a/docs/RELNOTES-6.3 b/docs/RELNOTES-6.3
index e969d2ba816..3a4ea3f96cd 100644
--- a/docs/RELNOTES-6.3
+++ b/docs/RELNOTES-6.3
@@ -32,6 +32,7 @@ To Do before release
  Fix dinoshade bug
  Switch to freeglut
  Increase MAX_DRAWBUFFERS
+ driver hooks for BeginQuery/EndQuery
 
 
 
@@ -52,4 +53,4 @@ D3D			needs updating
 
 
 ----------------------------------------------------------------------
-$Id: RELNOTES-6.3,v 3.5 2004/11/27 19:42:16 brianp Exp $
+$Id: RELNOTES-6.3,v 3.6 2004/12/09 23:21:36 brianp Exp $
diff --git a/docs/VERSIONS b/docs/VERSIONS
index eb10482bd9b..6bd7acdc47d 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1297,6 +1297,23 @@ Mesa Version History
 	- fixed color index mode glDrawPixels bug (Karl Schultz)
 
 
+6.2.1  December 9, 2004
+    Bug fixes:
+	- don't apply regular fog or color sum when using a fragment program
+	- glProgramEnvParameter4fARB always generated an error on
+	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
+	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
+	- fixed width/height mix-up in glSeparableFilter2D()
+	- fixed regression in glCopyPixels + convolution
+	- glReadPixels from a clipped front color buffer didn't always work
+	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
+	- Attempting queries/accesses of VBO 0 weren't detected as errors
+	- paletted textures failed if the palette had fewer that 256 entries
+    Changes:
+	- fixed a bunch of compiler warnings found with gcc 3.4
+	- bug reports should to go bugzilla.freedesktop.org
+
+
 6.3  Month day, 2004
     New:
 	- GL_ARB_draw_buffers extension
diff --git a/docs/contents.html b/docs/contents.html
index 0551986e05d..aca9aa21d93 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -20,7 +20,7 @@
 
 <b>Download / Install</b>
 <ul>
-<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (6.2)</a>
+<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (6.2.1)</a>
 <li><a href="download.html" target="MainFrame">Downloading/Unpacking</a>
 <li><a href="install.html" target="MainFrame">Compilation/Installation</a>
 <li><a href="glu.html" target="MainFrame">SGI's GLU</a>
diff --git a/docs/news.html b/docs/news.html
index 6da529ec190..c33c619354d 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -7,6 +7,40 @@
 <H1>News</H1>
 
 
+<h2>December 9, 2004</h2>
+<p>
+Mesa 6.2.1 has been released.
+This is a stable release which just fixes bugs since the 6.2 release.
+</p>
+<pre>
+    Bug fixes:
+	- don't apply regular fog or color sum when using a fragment program
+	- glProgramEnvParameter4fARB always generated an error on
+	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
+	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
+	- fixed width/height mix-up in glSeparableFilter2D()
+	- fixed regression in glCopyPixels + convolution
+	- glReadPixels from a clipped front color buffer didn't always work
+	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
+	- Attempting queries/accesses of VBO 0 weren't detected as errors
+	- paletted textures failed if the palette had fewer that 256 entries
+    Changes:
+	- fixed a bunch of compiler warnings found with gcc 3.4
+	- bug reports should to go bugzilla.freedesktop.org
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+80008a92f6e055d3bfdde2cf331ec3fa  MesaLib-6.2.1.tar.gz
+f43228cd2bf70f583ef3275c1c545421  MesaLib-6.2.1.tar.bz2
+dec26cfd40116ad021020fea2d94f652  MesaLib-6.2.1.zip
+2c7af3c986a7571c8713c8bfee7e49e3  MesaDemos-6.2.1.tar.gz
+3cac74667b50bcbd4f67f594fb4224a2  MesaDemos-6.2.1.tar.bz2
+75b3edd12eb2b370caf05f29b99e508a  MesaDemos-6.2.1.zip
+</pre>
+
+
 <h2>October 2, 2004</h2>
 <p>
 Mesa 6.2 has been released.
@@ -32,6 +66,17 @@ This is a stable release which just fixes bugs since the 6.1 release.
 	- glTexSubImage didn't handle pixels=NULL correctly for PBOs
 	- fixed color index mode glDrawPixels bug (Karl Schultz)
 </pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+9e8f34b059272dbb8e1f2c968b33bbf0  MesaLib-6.2.tar.gz
+3d6a6362390b6a37d3cb2e615f3ac7db  MesaLib-6.2.tar.bz2
+6cfd7895d28e695c0dbbed9469564091  MesaLib-6.2.zip
+3e06e33b0809f09855cb60883b8bdfef  MesaDemos-6.2.tar.gz
+9d160009c3dfdb35fe7e4088c9ba8f85  MesaDemos-6.2.tar.bz2
+856f7ec947122eb3c8985ebc2f654dcd  MesaDemos-6.2.zip
+</pre>
 
 
 <h2>August 18, 2004</h2>
@@ -913,6 +958,6 @@ source code</a>.</p>
 
 
 <hr>
-$Id: news.html,v 3.15 2004/10/02 15:26:25 brianp Exp $
+$Id: news.html,v 3.16 2004/12/09 23:21:36 brianp Exp $
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/relnotes.html b/docs/relnotes.html
index a059e2dd140..f0fd4d1ab17 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -12,6 +12,7 @@ The release notes summarize what's new or changed in each Mesa release.
 
 <UL>
 <LI><A HREF="RELNOTES-6.3">RELNOTES-6.3</A>
+<LI><A HREF="RELNOTES-6.2">RELNOTES-6.2.1</A>
 <LI><A HREF="RELNOTES-6.2">RELNOTES-6.2</A>
 <LI><A HREF="RELNOTES-6.1">RELNOTES-6.1</A>
 <LI><A HREF="RELNOTES-6.0">RELNOTES-6.0</A>