diff --git a/HISTORY b/HISTORY
index 10df45e5d4..b36bdea06e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -14,6 +14,7 @@ SIGPIPE crash fix(Darren)
 large object fixes(Sven)
 allow btree indexes to handle NULLs(Vadim)
 timezone fixes(D'Arcy)
+select SUM(x) can return NULL on no rows(Thomas)
 internal optimizer, executor bug fixes(Vadim)
 fix problem where inner loop in < or <= has no rows(Vadim)
 prevent re-commuting join index clauses(Vadim)
@@ -42,20 +43,19 @@ new ANSI Time and Date types (Thomas)
 move large chunks of data in backend(Martin)
 multi-column btree indexes(Vadim)
 new SET var TO value command(Martin)
-auto-udpate transaction status on reads(Dan)
+update transaction status on reads(Dan)
 new locale settings for character types(Oleg)
 new SEQUENCE serial number generator(Vadim)
-select SUM(x) can return NULL on no rows(Thomas)
 GROUP BY function now possible(Vadim)
 re-organize regression test(Thomas,Marc)
 new optimizer operation weights(Vadim)
 new psql \z grant/permit option(Marc)
-new MONEY data type(D'Arcy)
+new MONEY data type(D'Arcy,Thomas)
 tcp socket communication speed improved(Vadim)
 new VACUUM option for attribute statistics, and for certain columns (Vadim)
 many geometric type improvements(Thomas,Keith)
 additional regression tests(Thomas)
-new datestyle variable(Thomas)
+new datestyle variable(Thomas,Vadim,Martin)
 more comparison operators for sorting types(Thomas)
 new conversion functions(Thomas)
 new more compact btree format(Vadim)
@@ -78,7 +78,6 @@ more shared library support
 c++ include file cleanup(Bruce)
 warn about buggy flex(Bruce)
 
-
 PostgreSQL 6.0                   Wed Jan 29 00:19:54 EST 1997
 -------------------------------------------------------------
 
diff --git a/doc/TODO b/doc/TODO
index 2ffa0fbd68..50a585d202 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,7 +1,7 @@
 ====================================================
 TODO list (FAQ) for PostgreSQL
 ====================================================
-last updated:		Wed May 14 16:15:37 EDT 1997
+last updated:		Wed May 14 17:51:33 EDT 1997
 
 current maintainer:	Bruce Momjian (maillist@candle.pha.pa.us)
 
@@ -189,6 +189,7 @@ SIGPIPE crash fix(Darren)
 large object fixes(Sven)
 allow btree indexes to handle NULLs(Vadim)
 timezone fixes(D'Arcy)
+select SUM(x) can return NULL on no rows(Thomas)
 internal optimizer, executor bug fixes(Vadim)
 fix problem where inner loop in < or <= has no rows(Vadim)
 prevent re-commuting join index clauses(Vadim)
@@ -217,20 +218,19 @@ new ANSI Time and Date types (Thomas)
 move large chunks of data in backend(Martin)
 multi-column btree indexes(Vadim)
 new SET var TO value command(Martin)
-auto-udpate transaction status on reads(Dan)
+update transaction status on reads(Dan)
 new locale settings for character types(Oleg)
 new SEQUENCE serial number generator(Vadim)
-select SUM(x) can return NULL on no rows(Thomas)
 GROUP BY function now possible(Vadim)
 re-organize regression test(Thomas,Marc)
 new optimizer operation weights(Vadim)
 new psql \z grant/permit option(Marc)
-new MONEY data type(D'Arcy)
+new MONEY data type(D'Arcy,Thomas)
 tcp socket communication speed improved(Vadim)
 new VACUUM option for attribute statistics, and for certain columns (Vadim)
 many geometric type improvements(Thomas,Keith)
 additional regression tests(Thomas)
-new datestyle variable(Thomas)
+new datestyle variable(Thomas,Vadim,Martin)
 more comparison operators for sorting types(Thomas)
 new conversion functions(Thomas)
 new more compact btree format(Vadim)