diff --git a/changelog.txt b/changelog.txt
index 08f36d31..c052fc21 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,8 +2,27 @@ SPRING WEB SERVICES CHANGELOG
 =============================
 http://www.springframework.org/spring-ws
 
+Changes in version 2.1.1.RELEASE
+--------------------------------
+
+** Bug
+    * [SWS-776] - Windows-specific error with relative XSD referencing
+    * [SWS-779] - PayloadValidatingInterceptor 's method is not getting triggered in the echo server sample program when the echo client program is executed. 
+    * [SWS-782] - DefaultMethodEndpointAdapter.JDOM_CLASS_NAME must be updated to "org.jdom2.Element"
+    * [SWS-783] - SaxUtils leaks file handles, locks file on Windows
+    * [SWS-787] - MethodEndpoint.getBean is inconsistent with its API
+    * [SWS-789] - SoapEnvelopeLoggingInterceptor won't log
+
+** Improvement
+    * [SWS-784] - Add URLPathEndpointMapping Feature
+    * [SWS-785] - MTOM sample should not use deprecated api
+
+** New Feature
+    * [SWS-786] - SOAP envelope Matcher / MessageCreator
+    * [SWS-791] - Transform schemaLocation in WsdlDefinitionHandlerAdapter
+
 Changes in version 2.1.0.RELEASE
-----------------------------
+--------------------------------
 
 ** Bug
     * [SWS-777] - SoapFaultMappingExceptionResolver not handling exception
diff --git a/notes.txt b/notes.txt
index 211b849b..069bec50 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,40 +1,9 @@
 Dear Spring community,
 
-I'm pleased to announce that Spring Web Services 2.1.0.RELEASE has been released!
+I'm pleased to announce that Spring Web Services 2.1.1.RELEASE has been released!
 
-This is the first GA release in the 2.1 release cycle. It mainly
-consists of necessary upgrades to third party dependencies. Specifically:
-
-- WSS4J has been upgraded to 1.6.
-- XmlSchema has been upgraded to 2.0
-- Support for Apache HttpClient 4.0
-- JDOM has been upgraded to 2.0
-
-and various other minor library upgrades.
-
-Some of the library upgrades contain changes that are not backwards compatible.
-As such, you might be required to change your code and/or configuration as a
-consequence. More specifically:
-
-WSS4J:
-- SpringDigestPasswordValidationCallbackHandler and
-  SpringPlainTestPasswordValidationCallbackHandler have been merged into
-  SpringSecurityPasswordValidationCallbackHandler, which works the same way as
-  the SpringDigestPasswordValidationCallbackHandler (i.e. supply it with a
-  UserDetailsService).
-- The Wss4jSecurityInterceptor no longer has the securementCallbackHandler
-  property, as it's no longer used by WS4J.
-
-JDOM:
-- JDOM 2.0 changed the package name from org.jdom.x to org.jdom2.x. Make sure
-  to switch to this new package when using JDOM in combination with
-  @RequestBody/@ResponseBody as well as the AbstractJDomPayloadEndpoint.
-
-<sws:annotation-driven/>
-- When using <sws-annotation-driven/>, it might be required to set "order"
-  property values on custom exception resolvers. See
-  https://jira.springsource.org/browse/SWS-772?focusedCommentId=79384#comment-79384
-  for more details.
+This is the second GA release in the 2.1 release cycle. It mainly
+consists of bug fixes.
 
 Please see the changelog for more details.
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 60867e4f..373cfdec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -54,9 +54,9 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <osgi.version>2.1.0.RELEASE</osgi.version>
+        <osgi.version>2.1.1.RELEASE</osgi.version>
         <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
-        <spring.framework.version>3.1.1.RELEASE</spring.framework.version>
+        <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
         <spring.framework.osgi.range>"[3.1.0, 4.0.0)"</spring.framework.osgi.range>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/readme.txt b/readme.txt
index 03826e25..16758da1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 2.1.0.RELEASE (May 2012)
+SPRING WEB SERVICES 2.1.1.RELEASE (September 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.1.0.RELEASE.jar
+* spring-ws-core-2.1.1.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.1.0.RELEASE.jar
+* spring-ws-support-2.1.1.RELEASE.jar
 - Contents: The Spring-WS Support
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
                 [JMS, JavaMail]
 
-* spring-ws-security-2.1.0.RELEASE.jar
+* spring-ws-security-2.1.1.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.1.0.RELEASE.jar
+* spring-ws-test-2.1.1.RELEASE.jar
 - Contents: Spring-WS Testing framework
 - Dependencies: JUnit, XMLUnit
 
-* spring-xml-2.1.0.RELEASE.jar
+* spring-xml-2.1.1.RELEASE.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-* spring-ws-2.1.0.RELEASE-all.jar
+* spring-ws-2.1.1.RELEASE-all.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above