diff --git a/HISTORY b/HISTORY
index 5e855bdecaf7e970e6f04cc59c117ba9ddbe2fff..6daab428632b0c8ac527e05da778979f14ef3b15 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,21 @@
+PostgreSQL 6.2.1                 Fri Oct 17 00:01:27 EDT 1997
+-------------------------------------------------------------
+
+This release does NOT require a dump/restore for those running 6.2.
+Please see the appropriate /migration file for more information.
+
+Changes in this release
+-----------------------
+Allow TIME and TYPE column names(Thomas)
+Allow larger range of true/false as boolean values(Thomas)
+Support output of "now" and "current"(Thomas)
+Handle DEFAULT with INSERT of NULL properly(Vadim)
+fix for buffer cache reference count problem(Vadim)
+Allow strings to span lines, like ANSI(Thomas)
+Fix for backward ORDER BY(Vadim)
+Fix avg(cash) computation(Thomas)
+
+
 PostgreSQL 6.2               Thu Oct 02 12:53:46 EDT 1997
 -------------------------------------------------------------
 
diff --git a/INSTALL b/INSTALL
index 6ee62c79496beb776495e12992550ffddccea527..fba0c809254fe97709a6505ee3ccd52ec370180e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ POSTGRESQL INSTALLATION INSTRUCTIONS
 Copyright (c) 1997 Regents of  the University of California
 
 This is file /usr/src/pgsql/INSTALL.  It contains notes on how to install
-PostgreSQL v6.2.  Up to date information on PostgreSQL may be found at
+PostgreSQL v6.2.1.  Up to date information on PostgreSQL may be found at
 http://www.postgresql.org.
 
 PostgreSQL is an RDBMS database server.  It is not completely ANSI SQL
@@ -525,7 +525,7 @@ PostgreSQL:
         rm -rf /usr/local/pgsql_6_0
         # Also delete old database directory tree if it is not in
         #  /usr/local/pgsql_6_0/data
-        rm ~/postgresql-v6.2.tar.gz
+        rm ~/postgresql-v6.2.1.tar.gz
 
  26) You will probably want to print out the documentation.  Here is how
      you might do it if you have Ghostscript on your system and are
@@ -552,7 +552,7 @@ PostgreSQL:
      supported platforms.  We therefore ask you to let us know if you did
      or did not get PostgreSQL to work on you system.  Please send a
      mail message to pgsql-ports@postgresql.org telling us the following:
-       - The version of PostgreSQL (v6.2, 6.1.1, beta 970703, etc.).
+       - The version of PostgreSQL (v6.2.1, 6.1.1, beta 970703, etc.).
        - Your operating system (i.e. RedHat v4.0 Linux v2.0.26).
        - Your hardware (SPARC, i486, etc.).
        - Did you compile, install and run the regression tests cleanly?
diff --git a/README b/README
index 66adbef8c7aad4f22babe8d034db95b4cbe5e4c1..7a77e917c365c06079acf2ce3d03623e991bf081 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 PostgreSQL Data Base Management System (formerly known as Postgres, then
 as Postgres95).
   
-This directory contains the version 6.2 release of the PostgreSQL
+This directory contains the version 6.2.1 release of the PostgreSQL
 database server.  The server is not ANSI SQL compliant, but it gets
 closer with every release.  After you unzip and untar the distribution
 file, look at file INSTALL for the installation notes and file HISTORY
diff --git a/doc/FAQ b/doc/FAQ
index 8a2fe2c454f8b881fa4862d6b9c5a15400562f5d..86fa7dda9427e220868941c651003dfeb2e629e2 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,8 +1,8 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Thu Oct  2 14:08:20 EDT 1997
-   Version: 6.2
+   Last updated: Wed Oct 15 23:16:48 EDT 1997
+   Version: 6.2.1
    
    Current maintainer: Bruce Momjian (maillist@candle.pha.pa.us)
    
@@ -241,9 +241,9 @@ Section 1: General Questions
      
   1.6) Latest release of PostgreSQL
   
-   The latest release of PostgreSQL is version 6.2, which was released
-   on October 2, 1997. For information about what is new in 6.2, see our
-   TODO list on our WWW page.
+   The latest release of PostgreSQL is version 6.2.1, which was released
+   on October 17th, 1997. For information about what is new in 6.2.1, see
+   our TODO list on our WWW page.
    
   1.7) Is there a commercial version of PostgreSQL?
   
@@ -279,18 +279,14 @@ Section 1: General Questions
   
    PostgreSQL v1.09 is compatible with databases created with v1.01.
    
-   Upgrading to 6.1 requires a dump and restore from previous releases.
+   Upgrading to 6.2.1 from pre-6.2 requires a dump and restore.
    
-   Upgrading from 6.1 to 6.1.1 requires running configure, compile of the
-   new release, recompile of all your custom applications to use the new
-   libpq, and then an install while the postmaster is temporarily
-   stopped.
-   
-   Upgrading to 6.2 requires a dump and restore from previous releases.
+   Upgrading to 6.2.1 from 6.2 does not require a dump, but see the
+   appropriate /migration file in the distribution.
    
    Those ugrading from versions earlier than 1.09 must upgrade to 1.09
    first without a dump/reload, then dump the data from 1.09, and then
-   load it into 6.2.
+   load it into 6.2.1.
    
   1.11) Are there ODBC drivers for PostgreSQL?
   
@@ -645,8 +641,8 @@ BYTEA           bytea           variable-length array of bytes
    could select the same new id. This statement should be performed
    within a transaction.
    
-   Yet another way is to use general trigger function autoinc()
-   from contrib/spi/autoinc.c
+   Yet another way is to use general trigger function autoinc() from
+   contrib/spi/autoinc.c.
    
   3.16) What are the pg_psort.XXX files in my database directory?
   
diff --git a/doc/bug.template b/doc/bug.template
index 3e6aa858ab15c012cca00852cead54bb80bfc362..18502ba39d11f44ef3d5ebf5150b7b5eadf2af42 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration
 
   Operating System (example: Linux 2.0.26 ELF) 	:
 
-  PostgreSQL version (example: PostgreSQL-6.2)  :   PostgreSQL-6.2
+  PostgreSQL version (example: PostgreSQL-6.2.1):   PostgreSQL-6.2.1
 
   Compiler used (example:  gcc 2.7.2)		:
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index b55a23c429d04ebff4c47226508a07c0185d2968..4f5bc86ae754d8a916c2042cebefde4176672b70 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.49 1997/10/02 13:57:05 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.50 1997/10/16 04:14:00 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1976,7 +1976,7 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
 	char		rightarg[MAXQUERYLEN];
 	char		commutator[MAXQUERYLEN];
 	char		negator[MAXQUERYLEN];
-	char		restrict[MAXQUERYLEN];
+	char		restrictor[MAXQUERYLEN];
 	char		join[MAXQUERYLEN];
 	char		sortop[MAXQUERYLEN];
 
@@ -2026,9 +2026,9 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
 			  findOprByOid(oprinfo, numOperators, oprinfo[i].oprnegate));
 
 		if (strcmp(oprinfo[i].oprrest, "-") == 0)
-			restrict[0] = '\0';
+			restrictor[0] = '\0';
 		else
-			sprintf(restrict, ", RESTRICT = %s ", oprinfo[i].oprrest);
+			sprintf(restrictor, ", RESTRICT = %s ", oprinfo[i].oprrest);
 
 		if (strcmp(oprinfo[i].oprjoin, "-") == 0)
 			join[0] = '\0';
@@ -2059,7 +2059,7 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
 				rightarg,
 				commutator,
 				negator,
-				restrict,
+				restrictor,
 				(strcmp(oprinfo[i].oprcanhash, "t")) ? ", HASHES" : "",
 				join,
 				sortop);
diff --git a/src/include/version.h b/src/include/version.h
index ab2b82bc7dccf47a1f9c56f80ec0f4d2c64710c8..d2236452107287ba28cf2468d60aafce213e0f63 100644
--- a/src/include/version.h
+++ b/src/include/version.h
@@ -4,7 +4,7 @@
  *	  this file contains the interface to version.c.
  *	  Also some parameters.
  *
- * $Id: version.h,v 1.5 1997/10/03 17:31:29 scrappy Exp $
+ * $Id: version.h,v 1.6 1997/10/16 04:14:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@ void
 			SetPgVersion(const char *path, char **reason_p);
 
 #define PG_RELEASE		6
-#define PG_VERSION		2
+#define PG_VERSION		1
 #define PG_VERFILE		"PG_VERSION"
 
 #endif
diff --git a/src/man/libpq.3 b/src/man/libpq.3
index 2e4491df826dbadac8d6924646c750dee8f037f9..94c00ae3fafd47dd21c4819fefc040d76e8c2e23 100644
--- a/src/man/libpq.3
+++ b/src/man/libpq.3
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.5 1997/10/01 18:14:53 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.6 1997/10/16 04:14:19 momjian Exp $
 .TH LIBPQ INTRO 03/12/94 PostgreSQL PostgreSQL
 .SH DESCRIPTION
 Libpq is the programmer's interface to Postgres.  Libpq is a set of
@@ -202,7 +202,7 @@ be used to retrieve the tuples returned by the query.
 
 .B PQntuples
 returns the number of tuples (instances) in the query result, or the
-number of rows affected for queries that do not return a tuples.
+number of rows affected for queries that do not return any tuples.
 
 .nf
 int PQntuples(PGresult *res);
diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
new file mode 100644
index 0000000000000000000000000000000000000000..18d55e974e00d70be4b76f4dcc4a130394316365
--- /dev/null
+++ b/src/tools/RELEASE_CHANGES
@@ -0,0 +1,9 @@
+INSTALL
+HISTORY
+README
+doc/FAQ, including version number
+doc/Machine-specific FAQ's
+doc/TODO
+doc/bug.template
+include/version.h
+