diff --git a/src/main/resources/apache-license.txt b/src/main/resources/license.txt
similarity index 91%
rename from src/main/resources/apache-license.txt
rename to src/main/resources/license.txt
index 261eeb9e9..7584e2dfe 100644
--- a/src/main/resources/apache-license.txt
+++ b/src/main/resources/license.txt
@@ -199,3 +199,18 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+=======================================================================   
+
+To the extent any open source subcomponents are licensed under the EPL and/or other 
+similar licenses that require the source code and/or modifications to 
+source code to be made available (as would be noted above), you may obtain a 
+copy of the source code corresponding to the binaries for such open source 
+components and modifications thereto, if any, (the "Source Files"), by 
+downloading the Source Files from http://www.springsource.org/download, 
+or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview 
+Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com.  All 
+such requests should clearly specify:  OPEN SOURCE FILES REQUEST, Attention General 
+Counsel.  VMware shall mail a copy of the Source Files to you on a CD or equivalent 
+physical medium.  This offer to obtain a copy of the Source Files is valid for three 
+years from the date you acquired this Software product.
\ No newline at end of file
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index e6900be90..d301f9eb6 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,21 +1,10 @@
-   ========================================================================
-   == NOTICE file corresponding to section 4 d of the Apache License,    ==
-   == Version 2.0, in this case for the Spring Integration distribution. ==
-   ========================================================================
+Spring Data Commons 1.0
+Copyright (c) [2010] SpringSource, a division of VMware, Inc.
 
-   This product includes software developed by
-   the Apache Software Foundation (http://www.apache.org).
+This product is licensed to you under the Apache License, Version 2.0 (the "License").  
+You may not use this product except in compliance with the License.  
 
-   The end-user documentation included with a redistribution, if any,
-   must include the following acknowledgement:
-
-     "This product includes software developed by the Spring Framework
-      Project (http://www.springframework.org)."
-
-   Alternatively, this acknowledgement may appear in the software itself,
-   if and wherever such third-party acknowledgements normally appear.
-
-   The names "Spring", "Spring Framework", and "Spring Data" must
-   not be used to endorse or promote products derived from this software
-   without prior written permission. For written permission, please contact
-   enquiries@springsource.com.
+This product may include a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the subcomponent's license, as noted in the LICENSE file.
\ No newline at end of file