diff --git a/changelog.txt b/changelog.txt
index 4ba00013..218a02d4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,21 @@ SPRING WEB SERVICES CHANGELOG
 =============================
 http://www.springframework.org/spring-ws
 
+Changes in version 2.0.4.RELEASE
+----------------------------------
+
+** Bug
+    * [SWS-647] - PayloadValidatingInterceptor throws IllegalArgumentException when passed a schema collection
+    * [SWS-742] - JMSCorrelationID together with Oracle AQ
+    * [SWS-748] - Not well formed xml causes server 500 error
+    * [SWS-750] - SaajSoapMessageFactory's checkForUtf8ByteOrderMark is corrupting input stream
+    * [SWS-752] - Provider com.sun.xml.stream.ZephyrParserFactory not found using annotation-driven
+
+** Improvement
+    * [SWS-491] - Digital signing java 6
+    * [SWS-745] - Convenience constructor for SimpleUsernamePasswordCallbackHandler
+    * [SWS-749] - org.springframework.xml.sax.SaxUtils swallows exceptions
+
 Changes in version 2.0.3.RELEASE
 ----------------------------------
 
diff --git a/notes.txt b/notes.txt
index 72b971f0..a0859993 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,6 +1,6 @@
 Dear Spring community,
 
-I'm pleased to announce that Spring Web Services 2.0.3.RELEASE has
+I'm pleased to announce that Spring Web Services 2.0.4.RELEASE has
 been released!
 
 This is the latest GA release in the 2.0 release cycle. It contains bug fixes.
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c682f63..48e9887e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <osgi.version>2.0.3.RELEASE</osgi.version>
+        <osgi.version>2.0.4.RELEASE</osgi.version>
         <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
         <spring.framework.version>3.1.0.RELEASE</spring.framework.version>
         <spring.framework.osgi.range>"[3.1.0, 4.0.0)"</spring.framework.osgi.range>
diff --git a/readme.txt b/readme.txt
index c97d3a50..b741763b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 2.0.3.RELEASE (October 2011)
+SPRING WEB SERVICES 2.0.4.RELEASE (January 2012)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -37,31 +37,31 @@ The following distinct jar files are included in the distribution. This list spe
 third-party dependencies. Libraries in [brackets] are optional, i.e. just necessary for certain functionality. For an 
 exact list of Spring-WS project dependencies see the respective Maven2 pom.xml files.
 
-* spring-ws-core-2.0.3.RELEASE.jar
+* spring-ws-core-2.0.4.RELEASE.jar
 - Contents: The Spring-WS Core
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-oxm
                 [Log4J, spring-web, spring-webmvc, SAAJ, JDOM, StAX, Servlet API, JAF, Axiom, DOM4J, XOM, WSDL4J]
 
-* spring-ws-support-2.0.3.RELEASE.jar
+* spring-ws-support-2.0.4.RELEASE.jar
 - Contents: The Spring-WS Support
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
                 [JMS, JavaMail]
 
-* spring-ws-security-2.0.3.RELEASE.jar
+* spring-ws-security-2.0.4.RELEASE.jar
 - Contents: Spring-WS Security integration
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-ws-core
                 [Log4J, xmlsdig, xmlsec, XWS-security, Acegi, WSS4J]
 
-* spring-ws-test-2.0.3.RELEASE.jar
+* spring-ws-test-2.0.4.RELEASE.jar
 - Contents: Spring-WS Testing framework
 - Dependencies: JUnit, XMLUnit
 
-* spring-xml-2.0.3.RELEASE.jar
+* spring-xml-2.0.4.RELEASE.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-* spring-ws-2.0.3.RELEASE-all.jar
+* spring-ws-2.0.4.RELEASE-all.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above