diff --git a/doc/FAQ b/doc/FAQ
index ce3ddad918a..3511d0e93e0 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -169,7 +169,7 @@
    
   1.6) What is the most recent release?
   
-   The latest release of PostgreSQL is version 8.1.5.
+   The latest release of PostgreSQL is version 8.2.1.
    
    We plan to have a major release every year, with minor releases every
    few months.
diff --git a/doc/bug.template b/doc/bug.template
index 65111dc4788..f4c0af0ecd6 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -31,7 +31,7 @@ System Configuration:
 
   Operating System (example: Linux 2.4.18)	:
 
-  PostgreSQL version (example: PostgreSQL 8.1.5):  PostgreSQL 8.1.5
+  PostgreSQL version (example: PostgreSQL 8.1.6):  PostgreSQL 8.1.6
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index c22dc7ef668..a9754fe6931 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -219,7 +219,7 @@
 
     <H3 id="item1.6">1.6) What is the most recent release?</H3>
 
-    <P>The latest release of PostgreSQL is version 8.1.5.</P>
+    <P>The latest release of PostgreSQL is version 8.2.1.</P>
 
     <P>We plan to have a major release every year, with minor releases
     every few months.</P>
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 5b5f9b5b4fb..36faf1a9f91 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 "8.1.5"
-#define PG_VERSION_STR "8.1.5 (win32)"
+#define PG_VERSION "8.1.6"
+#define PG_VERSION_STR "8.1.6 (win32)"
 
 #define DEF_PGPORT 5432
 #define DEF_PGPORT_STR "5432"
diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in
index a4e432693e0..d69d98b045b 100644
--- a/src/interfaces/libpq/libpq.rc.in
+++ b/src/interfaces/libpq/libpq.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,1,5,0
- PRODUCTVERSION 8,1,5,0
+ FILEVERSION 8,1,6,0
+ PRODUCTVERSION 8,1,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", "8.1.5\0"
+            VALUE "FileVersion", "8.1.6\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2005\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "8.1.5\0"
+            VALUE "ProductVersion", "8.1.6\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 9321696df77..2f0502431bc 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    8,1,5,0
- PRODUCTVERSION 8,1,5,0
+ FILEVERSION    8,1,6,0
+ PRODUCTVERSION 8,1,6,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
    VALUE "CompanyName",      "PostgreSQL Global Development Group"
    VALUE "FileDescription",  FILEDESC
    VALUE "FileVersion",      PG_VERSION
-   VALUE "LegalCopyright", "Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group. Portions Copyright (c) 1994, Regents of the University of California."
+   VALUE "LegalCopyright", "Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group. Portions Copyright (c) 1994, Regents of the University of California."
    VALUE "ProductName",      "PostgreSQL"
    VALUE "ProductVersion",   PG_VERSION
   END