diff --git a/HISTORY b/HISTORY
index 214f86d33edad8571284e162b659221e6d60012e..a3d137cc25387a5548c9d1b24f5974109bf005f3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,34 @@
+  ------------------------------------------------------------------------
+                                Release 7.1.1
+  ------------------------------------------------------------------------
+
+
+Release 7.1.1  (2001-05-04)
+
+This has a variety of fixes from 7.1.
+
+Migration to v7.1.1
+
+A dump/restore is not required for those running 7.1.
+
+Changes
+-------
+Fix for numeric MODULO operator (Tom)
+pg_dump fixes (Philip)
+readline 4.2 fixes (Peter E)
+JOIN fixes (Tom)
+AIX, MSWIN, VAX,N32K fixes (Tom)
+Multibytes fixes (Tom)
+Unicode fixes (Tatsuo)
+Optimizer improvements (Tom)
+Fix for whole tuples in functions (Tom)
+Fix for pg_ctl and option strings with spaces (Peter E)
+ODBC fixes (Hiroshi)
+EXTRACT can now take string argument (Thomas)
+Python fixes (Darcy)
+
+
+
   ------------------------------------------------------------------------
                                 Release 7.1
   ------------------------------------------------------------------------
@@ -11,7 +42,7 @@ PostgreSQL code for many years.
 
 Major changes in this release:
 
-	Write-ahead Log (WAL) - To maintain database consistency in
+        Write-ahead Log (WAL) - To maintain database consistency in
 case of an operating system crash, previous releases of PostgreSQL
 have forced all data modifications to disk before each transaction
 commit.  With WAL, only one log file must be flushed to disk, greatly
@@ -19,22 +50,22 @@ improving performance.  If you have been using -F in previous releases
 to disable disk flushes, you may want to consider discontinuing its
 use.
 
-	TOAST - Previous releases had a compiled-in row length limit,
+        TOAST - Previous releases had a compiled-in row length limit,
 typically 8 - 32 kB.  This limit made storage of long text fields
 difficult.  With TOAST, long rows of any length can be stored with
 good performance.
 
-	Outer Joins - We now support outer joins.  The UNION/NOT IN
+        Outer Joins - We now support outer joins.  The UNION/NOT IN
 workaround for outer joins is no longer required.  We use the SQL92
 outer join syntax.
 
-	Function Manager - The previous C function manager did not
+        Function Manager - The previous C function manager did not
 handle NULLs properly, nor did it support 64-bit CPU's (Alpha).  The
 new function manager does.  You can continue using your old custom
 functions, but you may want to rewrite them in the future to use the
 new function manager call interface.
 
-	Complex Queries - A large number of complex queries that were
+        Complex Queries - A large number of complex queries that were
 unsupported in previous releases now work.  Many combinations of
 views, aggregates, UNION, LIMIT, cursors, subqueries, and inherited
 tables now work properly. Inherited tables are now accessed by
@@ -234,6 +265,7 @@ New contrib/pg_control utility (Oliver)
 New FreeBSD tools ipc_check, start-scripts/freebsd
 
 
+
   ------------------------------------------------------------------------
                                 Release 7.0.3
   ------------------------------------------------------------------------
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index ef2e95d54580242c8f28dbf537bdc1ed5f698788..a1a17a465590374ed52c5ee449467a66f6275162 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,10 +1,67 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.87 2001/05/03 16:26:21 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.88 2001/05/03 17:17:41 momjian Exp $
 -->
 
  <appendix id="release">
   <title>Release Notes</title>
 
+  <sect1 id="release-7-1-1">
+   <title>Release 7.1.1</title>
+
+   <note>
+   <title>Release date</title>
+   <simpara>2001-05-04</simpara>
+   </note>
+
+   <!--
+  <docinfo>
+  <authorgroup>
+  <author>
+  <firstname>Bruce</firstname>
+  <surname>Momjian</surname>
+  </author>
+  </authorgroup>
+  </docinfo>
+   -->
+
+   <para>
+    This has a variety of fixes from 7.1.
+   </para>
+
+
+   <sect2>
+    <title>Migration to version 7.1.1</title>
+
+    <para>
+     A dump/restore is <emphasis>not</emphasis> required for those running
+     7.1.
+    </para>
+   </sect2>
+
+   <sect2>
+    <title>Changes</title>
+
+    <para>
+     <programlisting>
+Fix for numeric MODULO operator (Tom)
+pg_dump fixes (Philip)
+readline 4.2 fixes (Peter E)
+JOIN fixes (Tom)
+AIX, MSWIN, VAX,N32K fixes (Tom)
+Multibytes fixes (Tom)
+Unicode fixes (Tatsuo)
+Optimizer improvements (Tom)
+Fix for whole tuples in functions (Tom)
+Fix for pg_ctl and option strings with spaces (Peter E)
+ODBC fixes (Hiroshi)
+EXTRACT can now take string argument (Thomas)
+Python fixes (Darcy)
+     </programlisting>
+    </para>
+   </sect2>
+  </sect1>
+
+
   <sect1>
    <title>Release 7.1</title>