diff --git a/configure b/configure
index c0abf2d525f2bb6d469149fb04f3da42fa9e80e2..8599a0aaee2662fdc67e4fd853c426249a1b8f7f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for PostgreSQL 7.4.5.
+# Generated by GNU Autoconf 2.53 for PostgreSQL 7.4.6.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -258,8 +258,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='7.4.5'
-PACKAGE_STRING='PostgreSQL 7.4.5'
+PACKAGE_VERSION='7.4.6'
+PACKAGE_STRING='PostgreSQL 7.4.6'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -769,7 +769,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 7.4.5 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 7.4.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -830,7 +830,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 7.4.5:";;
+     short | recursive ) echo "Configuration of PostgreSQL 7.4.6:";;
    esac
   cat <<\_ACEOF
 
@@ -950,7 +950,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 7.4.5
+PostgreSQL configure 7.4.6
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -967,7 +967,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 7.4.5, which was
+It was created by PostgreSQL $as_me 7.4.6, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -18050,7 +18050,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by PostgreSQL $as_me 7.4.5, which was
+This file was extended by PostgreSQL $as_me 7.4.6, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18112,7 +18112,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-PostgreSQL config.status 7.4.5
+PostgreSQL config.status 7.4.6
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index df56d547414f190ef07578a98fe71205b4aafe76..b0b8a9139674e39e2bae012a6f86f9ed38382d56 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.301.2.11 2004/08/18 03:11:25 tgl Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.301.2.12 2004/10/22 00:26:22 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -21,7 +21,7 @@ dnl The GNU folks apparently haven't heard that some people don't use
 dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
 m4_define([info], [doc])
 m4_define([infodir], [docdir])
-AC_INIT([PostgreSQL], [7.4.5], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [7.4.6], [pgsql-bugs@postgresql.org])
 m4_undefine([infodir])
 m4_undefine([info])
 AC_SUBST(docdir)
diff --git a/doc/bug.template b/doc/bug.template
index ed770f5d8d33d3b6d31c2fe822d5e989f88744ac..718dd7ccae0cd290cb6373dd96dd3fcbcecd8ae7 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration
 
   Operating System (example: Linux 2.4.18) 	:
 
-  PostgreSQL version (example: PostgreSQL-7.4.5):   PostgreSQL-7.4.5
+  PostgreSQL version (example: PostgreSQL-7.4.6):   PostgreSQL-7.4.6
 
   Compiler used (example:  gcc 2.95.2)		:
 
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index ba4d2366658c5f484b8610796ec24f369af705b9..aa68e90fd748d5dbced5d78648adf266b474619b 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,10 +1,80 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.235.2.27 2004/08/18 03:03:49 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.235.2.28 2004/10/22 00:26:22 tgl Exp $
 -->
 
 <appendix id="release">
  <title>Release Notes</title>
 
+  <sect1 id="release-7-4-6">
+   <title>Release 7.4.6</title>
+
+   <note>
+   <title>Release date</title>
+   <simpara>2004-10-22</simpara>
+   </note>
+
+   <para>
+    This release contains a variety of fixes from 7.4.5.
+   </para>
+
+
+   <sect2>
+    <title>Migration to version 7.4.6</title>
+
+    <para>
+     A dump/restore is not required for those running 7.4.X.
+    </para>
+   </sect2>
+
+   <sect2>
+    <title>Changes</title>
+
+<itemizedlist>
+<listitem><para>Repair possible failure to update hint bits on disk</para>
+<para>
+Under rare circumstances this oversight could lead to 
+<quote>could not access transaction status</> failures, which qualifies
+it as a potential-data-loss bug.
+</para></listitem>
+<listitem><para>Ensure that hashed outer join does not miss tuples</para>
+<para>
+Very large left joins using a hash join plan could fail to output unmatched
+left-side rows given just the right data distribution.
+</para></listitem>
+<listitem><para>Disallow running pg_ctl as root</para>
+<para>
+This is to guard against any possible security issues.
+</para></listitem>
+<listitem><para>Avoid using temp files in /tmp in make_oidjoins_check</para>
+<para>
+This has been reported as a security issue, though it's hardly worthy of
+concern since there is no reason for non-developers to use this script anyway.
+</para></listitem>
+<listitem><para>Prevent forced backend shutdown from re-emitting prior command
+result</para>
+<para>
+In rare cases, a client might think that its last command had succeeded when
+it really had been aborted by forced database shutdown.
+</para></listitem>
+<listitem><para>Repair bug in pg_stat_get_backend_idset()</para>
+<para>
+This could lead to misbehavior in some of the system-statistics views.
+</para></listitem>
+<listitem><para>Fix small memory leak in postmaster</para></listitem>
+<listitem><para>Fix <quote>expected both swapped tables to have TOAST
+tables</> bug</para>
+<para>
+This could arise in cases such as CLUSTER after ALTER TABLE DROP COLUMN.
+</para></listitem>
+<listitem><para>Prevent <literal>pg_ctl restart</> from adding <literal>-D</> multiple times</para></listitem>
+<listitem><para>Fix problem with NULL values in GiST indexes</para></listitem>
+<listitem><para><literal>::</> is no longer interpreted as a variable in an
+ECPG prepare statement</para></listitem>
+</itemizedlist>
+
+  </sect2>
+ </sect1>
+
   <sect1 id="release-7-4-5">
    <title>Release 7.4.5</title>
 
@@ -140,7 +210,7 @@ names from outer query levels.
 <para>
   This fixes a difficult-to-exploit security hole.
 </para></listitem>
-<listitem><para>Avoid locking conflict between ANALYZE and LISTEN/NOTIFY</para></listitem>
+<listitem><para>Avoid locking conflict between <command>ANALYZE</command> and <command>LISTEN</command>/<command>NOTIFY</command></para></listitem>
 <listitem><para>Numerous translation updates (various contributors)</para></listitem>
 </itemizedlist>
 
@@ -2258,6 +2328,56 @@ DROP SCHEMA information_schema CASCADE;
   </sect2>
  </sect1>
 
+  <sect1 id="release-7-3-8">
+   <title>Release 7.3.8</title>
+
+   <note>
+   <title>Release date</title>
+   <simpara>2004-10-22</simpara>
+   </note>
+
+   <para>
+    This release contains a variety of fixes from 7.3.7.
+   </para>
+
+
+   <sect2>
+    <title>Migration to version 7.3.8</title>
+
+    <para>
+     A dump/restore is not required for those running 7.3.X.
+    </para>
+   </sect2>
+
+   <sect2>
+    <title>Changes</title>
+
+<itemizedlist>
+<listitem><para>Repair possible failure to update hint bits on disk</para>
+<para>
+Under rare circumstances this oversight could lead to 
+<quote>could not access transaction status</> failures, which qualifies
+it as a potential-data-loss bug.
+</para></listitem>
+<listitem><para>Ensure that hashed outer join does not miss tuples</para>
+<para>
+Very large left joins using a hash join plan could fail to output unmatched
+left-side rows given just the right data distribution.
+</para></listitem>
+<listitem><para>Disallow running pg_ctl as root</para>
+<para>
+This is to guard against any possible security issues.
+</para></listitem>
+<listitem><para>Avoid using temp files in /tmp in make_oidjoins_check</para>
+<para>
+This has been reported as a security issue, though it's hardly worthy of
+concern since there is no reason for non-developers to use this script anyway.
+</para></listitem>
+</itemizedlist>
+
+  </sect2>
+ </sect1>
+
   <sect1 id="release-7-3-7">
    <title>Release 7.3.7</title>
 
@@ -3313,6 +3433,56 @@ operations on bytea columns (Joe)</para></listitem>
   </sect2>
  </sect1>
 
+  <sect1 id="release-7-2-6">
+   <title>Release 7.2.6</title>
+
+   <note>
+   <title>Release date</title>
+   <simpara>2004-10-22</simpara>
+   </note>
+
+   <para>
+    This release contains a variety of fixes from 7.2.5.
+   </para>
+
+
+   <sect2>
+    <title>Migration to version 7.2.6</title>
+
+    <para>
+     A dump/restore is not required for those running 7.2.X.
+    </para>
+   </sect2>
+
+   <sect2>
+    <title>Changes</title>
+
+<itemizedlist>
+<listitem><para>Repair possible failure to update hint bits on disk</para>
+<para>
+Under rare circumstances this oversight could lead to 
+<quote>could not access transaction status</> failures, which qualifies
+it as a potential-data-loss bug.
+</para></listitem>
+<listitem><para>Ensure that hashed outer join does not miss tuples</para>
+<para>
+Very large left joins using a hash join plan could fail to output unmatched
+left-side rows given just the right data distribution.
+</para></listitem>
+<listitem><para>Disallow running pg_ctl as root</para>
+<para>
+This is to guard against any possible security issues.
+</para></listitem>
+<listitem><para>Avoid using temp files in /tmp in make_oidjoins_check</para>
+<para>
+This has been reported as a security issue, though it's hardly worthy of
+concern since there is no reason for non-developers to use this script anyway.
+</para></listitem>
+<listitem><para>Update to newer versions of Bison</para></listitem>
+</itemizedlist>
+
+  </sect2>
+ </sect1>
 
   <sect1 id="release-7-2-5">
    <title>Release 7.2.5</title>
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index eef3f044e9990a2213d84305acbc5f9eaddebbca..0cba4a37e15db4ce147ded53ef9a59aa0479c4db 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -3,8 +3,8 @@
 /*
  * Parts of pg_config.h that you get with autoconf on other systems
  */
-#define PG_VERSION "7.4.5"
-#define PG_VERSION_STR "7.4.5 (win32)"
+#define PG_VERSION "7.4.6"
+#define PG_VERSION_STR "7.4.6 (win32)"
 
 #define SYSCONFDIR ""
 
diff --git a/src/interfaces/libpq/libpq.rc b/src/interfaces/libpq/libpq.rc
index 97aa836e0b6dc826a2cc7118cb293438cfa811e6..a610134623900c54b9a17a521870262ad9a1930a 100644
--- a/src/interfaces/libpq/libpq.rc
+++ b/src/interfaces/libpq/libpq.rc
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,4,5,0
- PRODUCTVERSION 7,4,5,0
+ FILEVERSION 7,4,6,0
+ PRODUCTVERSION 7,4,6,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "7, 4, 5, 0\0"
+            VALUE "FileVersion", "7, 4, 6, 0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2003\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "7, 4, 5, 0\0"
+            VALUE "ProductVersion", "7, 4, 6, 0\0"
         END
     END
     BLOCK "VarFileInfo"