diff --git a/CHANGES.txt b/CHANGES.txt
index 339dac5b01..002ca6001d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,51 @@
-0.4 dev
+0.4.0
+ * fix get_key_range problems when a node is down (CASSANDRA-440)
+   and add UnavailableException to more Thrift methods
+ * Add example EndPointSnitch contrib code (several tickets)
+
+
+0.4.0 RC2
+ * fix SSTable generation clash during compaction (CASSANDRA-418)
+ * reject method calls with null parameters (CASSANDRA-308)
+ * properly order ranges in nodeprobe output (CASSANDRA-421)
+ * fix logging of certain errors on executor threads (CASSANDRA-425)
+
+
+0.4.0 RC1
+ * Bootstrap feature is live; use -b on startup (several tickets)
+ * Added multiget api (CASSANDRA-70)
+ * fix Deadlock with SelectorManager.doProcess and TcpConnection.write
+   (CASSANDRA-392)
+ * remove key cache b/c of concurrency bugs in third-party
+   CLHM library (CASSANDRA-405)
+ * update non-major compaction logic to use two threshold values
+   (CASSANDRA-407)
+ * add periodic / batch commitlog sync modes (several tickets)
+ * inline BatchMutation into batch_insert params (CASSANDRA-403)
+ * allow setting the logging level at runtime via mbean (CASSANDRA-402)
+ * change default comparator to BytesType (CASSANDRA-400)
+ * add forwards-compatible ConsistencyLevel parameter to get_key_range
+   (CASSANDRA-322)
+ * r/m special case of blocking for local destination when writing with 
+   ConsistencyLevel.ZERO (CASSANDRA-399)
+ * Fixes to make BinaryMemtable [bulk load interface] useful (CASSANDRA-337);
+   see contrib/bmt_example for an example of using it.
+ * More JMX properties added (several tickets)
+ * Thrift changes (several tickets)
+    - Merged _super get methods with the normal ones; return values
+      are now of ColumnOrSuperColumn.
+    - Similarly, merged batch_insert_super into batch_insert.
+
+
+
+0.4.0 beta
  * On-disk data format has changed to allow billions of keys/rows per
    node instead of only millions
  * Multi-keyspace support
- * Added option to fsync before acknowledging writes
  * Scan all sstables for all queries to avoid situations where
    different types of operation on the same ColumnFamily could
    disagree on what data was present
  * Snapshot support via JMX
- * BinaryMemtable support for bulk load via hadoop; see
-   contrib/bmt_example for an example of using it.
  * Thrift API has changed a _lot_:
     - removed time-sorted CFs; instead, user-defined comparators
       may be defined on the column names, which are now byte arrays.
@@ -22,9 +59,6 @@
       columns as well as an offset.  (This allows use of indexes.)
       Added "ascending" flag to allow reasonably-efficient reverse
       scans as well.  Removed get_slice_by_range as redundant.
-    - Merged _super get methods with the normal ones; return values
-      are now of ColumnOrSuperColumn.
-    - Similarly, merged batch_insert_super into batch_insert.
     - get_key_range operates on one CF at a time
     - changed `block` boolean on insert methods to ConsistencyLevel enum,
       with options of NONE, ONE, QUORUM, and ALL.