diff --git a/CHANGES.txt b/CHANGES.txt
index 7132fe5953..07a882d25c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@
  * fix ConcurrentModificationException in Table.all() (CASSANDRA-3529)
  * make sstableloader recognize compressed sstables (CASSANDRA-3521)
  * avoids race in OutboundTcpConnection in multi-DC setups (CASSANDRA-3530)
+ * use SETLOCAL in cassandra.bat (CASANDRA-3506)
 Merged from 0.8:
  * fix concurrence issue in the FailureDetector (CASSANDRA-3519)
  * fix array out of bounds error in counter shard removal (CASSANDRA-3514)
diff --git a/NEWS.txt b/NEWS.txt
index b8016ee7f9..e1df21a442 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -12,6 +12,11 @@ by version X, but the inverse is not necessarily the case.)
 1.0.4
 =====
 
+Upgrading
+---------
+    - Nothing specific to 1.0.4 but please see the 1.0 upgrading section if
+      upgrading from a version prior to 1.0.0
+
 Features
 --------
     - A new upgradesstables command has been added to nodetool. It is very
@@ -20,6 +25,12 @@ Features
       command is to be prefered to scrub in all cases where sstables should be
       rewritten to the current format for upgrade purposes.
 
+JMX
+---
+    - The path for the data, commit log and saved cache directories exposed
+      through JMX
+    - The in-memory bloom filter sizes are now exposed through JMX
+
 
 1.0.3
 =====
diff --git a/build.xml b/build.xml
index f69c4dc024..8bc9dc7392 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) -->
-    <property name="base.version" value="1.0.3"/>
+    <property name="base.version" value="1.0.4"/>
     <property name="scm.default.path" value="cassandra/branches/cassandra-1.0.0"/>
     <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/>
     <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/>
diff --git a/debian/changelog b/debian/changelog
index 18aa147502..4fc4714c4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.0.4) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 25 Nov 2011 11:04:06 +0100
+
 cassandra (1.0.3) unstable; urgency=low
 
   * New release