diff --git a/HISTORY b/HISTORY
index 6dda50f63d4..0f8bf1b72ad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,35 @@
+PostgreSQL 6.3.2             Tue Apr  7 16:53:16 EDT 1998
+-------------------------------------------------------------
+
+A dump/restore is NOT required for those running 6.3.1.  A 
+'make distclean', 'make', and 'make install' is all that is required.
+This last step should be performed while the postmaster is not running.
+You should re-link any custom applications that use PostgreSQL libraries.
+
+Changes
+-------
+configure detection improvements for tcl/tk(Brook Milligan, Alvin)
+Manual page improvements(Bruce)
+BETWEEN and LIKE fix(Thomas)
+fix for psql \connect used by pg_dump(Oliver Elphick)
+Cleanup of postodbc source code indentation
+pgaccess, version 0.86
+HAVING clause now supported in SELECT(Stefan)
+qsort removed, now uses libc version, cleanups(Jeroen)
+fix for buffer over-runs detected(Maurice Gittens)
+fix for buffer overrun in libpgtcl(Randy Kunkee)
+fix for UNION with DISTINCT or ORDER BY(Bruce)
+gettimeofday configure check(Doug Winterburn)
+Fix "indexes not used" bug(Vadim)
+docs additions(Thomas)
+Fix for backend memory leak(Bruce)
+libreadline cleanup(Erwan MAS)
+Remove DISTDIR(Bruce)
+Makefile dependency cleanup(Jeroen van Vianen)
+ASSERT fixes(Bruce)
+
+
+
 PostgreSQL 6.3.1             Mon Mar 23 10:21:52 EST 1998
 -------------------------------------------------------------
 
diff --git a/INSTALL b/INSTALL
index f4131f6b810..1286bf2d098 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.3.1.  Up to date information on PostgreSQL may be found at
+PostgreSQL v6.3.2.  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
@@ -119,7 +119,7 @@ PostgreSQL:
 
       To check for disk space, use command "df -k".
 
-  4) Ftp file ftp://ftp.postgresql.org/pub/postgresql-v6.3.1.tar.gz from the
+  4) Ftp file ftp://ftp.postgresql.org/pub/postgresql-v6.3.2.tar.gz from the
      Internet.  Store it in your home directory.
 
   5) Some platforms use flex.  If your system uses flex then make sure
@@ -161,7 +161,7 @@ PostgreSQL:
      step.  Type (with the gunzip line and the following line typed as one
      line):
         cd
-        gunzip -c postgresql-v6.3.1.tar.gz |
+        gunzip -c postgresql-v6.3.2.tar.gz |
             tar xvf - src/bin/pg_dump/pg_dumpall
         chmod a+x src/bin/pg_dump/pg_dumpall
         src/bin/pg_dump/pg_dumpall > db.out
@@ -177,7 +177,8 @@ PostgreSQL:
      Please note that if you are upgrading from a version prior to
      Postgres95 v1.09 then you must back up your database, install
      Postgres95 v1.09, restore your database, then back it up again.
-     You should also read files /usr/src/pgsql/migration/*.
+
+     You should also read the appropriate files pgsql/migration/*.
 
      You must make sure that your database is not updated in the middle of
      your backup.  If necessary, bring down postmaster, edit the permissions
@@ -226,7 +227,7 @@ PostgreSQL:
 
  10) Unzip and untar the new source file.  Type
         cd /usr/src/pgsql
-        gunzip -c ~/postgresql-v6.3.1.tar.gz | tar xvf -
+        gunzip -c ~/postgresql-v6.3.2.tar.gz | tar xvf -
 
  11) Configure the source code for your system.  It is this step at which
      you can specify your actual source path and installation paths for
@@ -430,7 +431,7 @@ PostgreSQL:
      PostgreSQL.
 
      For a i686/Linux-ELF platform, no tests failed since this is the
-     v6.3.1 regression testing reference platform.
+     v6.3.2 regression testing reference platform.
 
      For the SPARC/Linux-ELF platform, using the 970525 beta version of
      PostgreSQL v6.2 the following tests "failed":
@@ -550,7 +551,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.3.1.tar.gz
+        rm ~/postgresql-v6.3.2.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
@@ -577,7 +578,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.3.1, 6.2.1, beta 970703, etc.).
+       - The version of PostgreSQL (v6.3.2, 6.2.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 713a29c9624..58c37472b83 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.3.1 release of the PostgreSQL
+This directory contains the version 6.3.2 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/TODO b/doc/TODO
index f54e5adb6c3..95f4ebb8b91 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Sat Mar 21 00:26:29 EST 1998
+Last updated:		Tue Apr  7 16:56:24 EDT 1998
 
 Current maintainer:	Bruce Momjian (maillist@candle.pha.pa.us)
 
@@ -28,6 +28,7 @@ Developers who have claimed items are:
 	* Jan is Jan Wieck <wieck@sapserv.debis.de>
 	* Jun is Jun Kuwamura <juk@rccm.co.jp>
 	* Kurt is "Kurt J. Lidl" <lidl@va.pubnix.com>
+	* Maarten is Maarten Boekhold <maartenb@dutepp0.et.tudelft.nl>
  	* Marc is Marc Fournier <scrappy@hub.org>
  	* Martin is Martin S. Utesch <utesch@aut.tu-freiberg.de>
 	* Michael is Michael Meskes <meskes@debian.org>
@@ -79,6 +80,9 @@ RELIABILITY
 * views on subselects fail
 * disallow inherited columns with the same name as new columns
 * recover or force failure when disk space is exhausted
+* default char() value not to full length crashes server on some OS's
+* -DISTINCT not on last query fails on UNION but not UNION ALL
+* Negative constants used with int2 or float4 columns fails
 
 ENHANCEMENTS
 ------------
@@ -88,7 +92,7 @@ ENHANCEMENTS
 * Allow transaction commits with rollback with no-fsync performance
 * More access control over who can create tables and access the database
 * Add full ANSI SQL capabilities
-	* Implement HAVING clause(Stephan)
+	* -Implement HAVING clause(Stephan)
 	* add OUTER joins, left and right (Thomas)
 	* make VIEWs updateable where possible
 	* add INTERSECTS, SUBTRACTS(Stephan)
@@ -157,6 +161,8 @@ ENHANCEMENTS
 * Have psql with no database name not connect to username as default(?)
 * Allow subqueries in target list
 * Granting permissions to another user looses permissions for the owner
+* Allow queries across multiple databases
+* Add replication of distributed databases
 
 PERFORMANCE
 -----------
@@ -194,6 +200,30 @@ DOCUMENTATION
 
 =============================================================================
 
+
+CHANGES IN THE 6.3.2 PATCH
+--------------------------
+configure detection improvements for tcl/tk(Brook Milligan, Alvin)
+Manual page improvements(Bruce)
+BETWEEN and LIKE fix(Thomas)
+fix for psql \connect used by pg_dump(Oliver Elphick)
+Cleanup of postodbc source code indentation
+pgaccess, version 0.86
+HAVING clause now supported in SELECT(Stefan)
+qsort removed, now uses libc version, cleanups(Jeroen)
+fix for buffer over-runs detected(Maurice Gittens)
+fix for buffer overrun in libpgtcl(Randy Kunkee)
+fix for UNION with DISTINCT or ORDER BY(Bruce)
+gettimeofday configure check(Doug Winterburn)
+Fix "indexes not used" bug(Vadim)
+docs additions(Thomas)
+Fix for backend memory leak(Bruce)
+libreadline cleanup(Erwan MAS)
+Remove DISTDIR(Bruce)
+Makefile dependency cleanup(Jeroen van Vianen)
+ASSERT fixes(Bruce)
+
+
 CHANGES IN THE 6.3.1 PATCH 
 --------------------------
 ecpg cleanup/fixes, now version 1.1(Michael Meskes)
diff --git a/doc/bug.template b/doc/bug.template
index 99674554848..cd3268e70b0 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.3)  :   PostgreSQL-6.3.1
+  PostgreSQL version (example: PostgreSQL-6.3.2)  :   PostgreSQL-6.3.2
 
   Compiler used (example:  gcc 2.7.2)		:
 
diff --git a/migration/6.3.1_to_6.3.2 b/migration/6.3.1_to_6.3.2
new file mode 100644
index 00000000000..e6a569c9ae7
--- /dev/null
+++ b/migration/6.3.1_to_6.3.2
@@ -0,0 +1,4 @@
+A dump/restore is NOT required for those running 6.3.  A 
+'make distclean', 'make', and 'make install' is all that is required.
+This last step should be performed while the postmaster is not running.
+You should re-link any custom applications that use PostgreSQL libraries.
diff --git a/register.txt b/register.txt
index d1ccb5ba914..62b16125a1a 100644
--- a/register.txt
+++ b/register.txt
@@ -1,6 +1,6 @@
 
 
-(1998-03-21)
+(1998-04-07)
 PostgreSQL has a Web site at http://www.postgresql.org/ which carries details
 on the latest release, upcoming features, and other information to make your
 work or play with PostgreSQL more productive.
diff --git a/src/configure.in b/src/configure.in
index a6f86424b2f..de16dbb367c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -71,10 +71,10 @@ fi
 
 cat <<EOT
 **************************************************************
-	PostreSQL v6.3.1 Installation Program
+	PostreSQL v6.3.2 Installation Program
 
 Welcome to the new improved PostgreSQL installation program.
-This configuration program is for version 6.3.1 of the
+This configuration program is for version 6.3.2 of the
 PostgreSQL software.
 
 EOT