diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml
index 506743cd2dc..ae8deb9ec0d 100644
--- a/doc/src/sgml/release-8.4.sgml
+++ b/doc/src/sgml/release-8.4.sgml
@@ -1,6 +1,199 @@
+
+ Release 8.4.18
+
+
+ Release Date
+ 2013-10-10
+
+
+
+ This release contains a variety of fixes from 8.4.17.
+ For information about new features in the 8.4 major release, see
+ .
+
+
+
+ Migration to Version 8.4.18
+
+
+ A dump/restore is not required for those running 8.4.X.
+
+
+
+ Also, if you are upgrading from a version earlier than 8.4.10,
+ see the release notes for 8.4.10.
+
+
+
+
+
+ Changes
+
+
+
+
+
+ Prevent downcasing of non-ASCII non-double-quoted identifiers in
+ multi-byte encodings (Andrew Dunstan)
+
+
+
+ The previous behavior was wrong and confusing.
+
+
+
+
+
+ Fix memory leak caused by lo_open() failure
+ (Heikki Linnakangas)
+
+
+
+
+
+ Fix memory overcommit bug when work_mem is using more
+ than 24GB of memory (Stephen Frost)
+
+
+
+
+
+ Fix libpq SSL deadlock bug (Stephen Frost)
+
+
+
+
+
+ Properly compute row estimates for boolean columns containing many NULL
+ values (Andrew Gierth)
+
+
+
+ Previously tests like col IS NOT TRUE and col IS
+ NOT FALSE did not properly factor in NULL values when estimating
+ plan costs.
+
+
+
+
+
+ Prevent pushing down WHERE clauses into unsafe
+ UNION/INTERSECT subqueries (Tom Lane)
+
+
+
+ Previously such push downs could generate errors.
+
+
+
+
+
+ Fix rare GROUP BY query error caused by improperly processed date type
+ modifiers (Tom Lane)
+
+
+
+
+
+ Allow view dump code to better handle dropped columns on base tables
+ (Tom Lane)
+
+
+
+
+
+ Fix possible deadlock during concurrent CREATE INDEX
+ CONCURRENTLY operations (Tom Lane)
+
+
+
+
+
+ Fix regexp_matches() handling of zero-length matches
+ (Jeevan Chalke)
+
+
+
+ Previously, zero-length matches like '^' could return too many matches.
+
+
+
+
+
+ Fix crash for overly-complex regular expressions (Heikki Linnakangas)
+
+
+
+
+
+ Fix regular expression match failures for back references combined with
+ non-greedy quantifiers (Jeevan Chalke)
+
+
+
+
+
+ Prevent CREATE FUNCTION from checking SET
+ variables unless function body checking is enabled (Tom Lane)
+
+
+
+
+
+ Fix pgp_pub_decrypt() so it works for secret keys with
+ passwords (Marko Kreen)
+
+
+
+
+
+ Remove rare inaccurate warning during vacuum of index-less tables
+ (Heikki Linnakangas)
+
+
+
+
+
+ Avoid possible failure when performing transaction control commands (e.g
+ ROLLBACK) in prepared queries (Tom Lane)
+
+
+
+
+
+ Allow various spellings of infinity on all platforms (Tom Lane)
+
+
+
+ Supported infinity values are "inf", "+inf", "-inf", "infinity",
+ "+infinity", and "-infinity".
+
+
+
+
+
+ Expand ability to compare rows to records and arrays (Rafal Rzepecki,
+ Tom Lane)
+
+
+
+
+
+ Update time zone data files to tzdata release 2013d
+ for DST law changes in DST law changes in Israel, Morocco, Palestine,
+ Paraguay. Also, historical zone data corrections for Macquarie Island
+ (Tom Lane)
+
+
+
+
+
+
+
+
Release 8.4.17