diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt
index 93b303a0044..4af80e2798d 100644
--- a/build-spring-framework/resources/changelog.txt
+++ b/build-spring-framework/resources/changelog.txt
@@ -3,7 +3,7 @@ SPRING FRAMEWORK CHANGELOG
 http://www.springsource.org
 
 
-Changes in version 3.0.4 (2010-07-15)
+Changes in version 3.0.4 (2010-07-23)
 -------------------------------------
 
 * support for Hibernate Validator 4.1 and EclipseLink 2.1
@@ -11,18 +11,25 @@ Changes in version 3.0.4 (2010-07-15)
 * ConversionService is able to deal with empty collections and nested collections (fixed regression)
 * ConversionService properly handles nested Resource arrays in Map values (fixed regression)
 * ConversionService does not accidentally use copy constructor for same type
+* BeanWrapper preserves annotation information for individual array/list/map elements
 * SpEL 'select last' operator now works consistently with maps
 * BeanWrapper/DataBinder's "autoGrowNestedPaths" works for Maps as well
 * Jaxb2Marshaller's "marshallerProperties" Map accepts any value type
+* JmsResourceHolder does not ignore IllegalStateException from locally synchronized transaction
 * Spring's MessageEndpointFactory classes are now JCA 1.6 compliant as well
 * AbstractJaxWsServiceExporter supports "bindingType" bean property, overriding @BindingType
 * AbstractJaxWsServiceExporter supports "webServiceFeatures" bean property on JAX-WS 2.2
+* DefaultJdoDialect supports JDO 3.0 query timeout facility (as supported by DataNucleus 2.1)
+* transaction names based on method id from most specific method (target class instead of interface)
 * added "validationMessageSource" property to LocalValidatorFactoryBean, for Spring-based messages
 * DispatcherServlet applies default view name translation to error views as well
 * mvc:annotation-driven reliably detects JSR-303 and JAXB2 in an OSGi environment as well
 * @MVC handler methods reliably resolve MultipartRequest arguments with HiddenHttpMethodFilter
 * @CookieValue returns decoded cookie value in a Servlet environment (analogous to @RequestParam)
+@ @ExceptionHandler works for inherited method and CGLIB proxies on Portlet controllers as well
+* MVC HandlerExceptionResolvers prevent caching for exception views if preventResponseCaching=true
 * Portlet @MVC's implicit render model will be updated at the end of the event phase
+* JSP EvalTag resolves "@myBeanName" references in expressions against the WebApplicationContext
 
 
 Changes in version 3.0.3 (2010-06-15)