diff --git a/build.gradle b/build.gradle
index 806d03fa39d..3d6d2f69931 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,11 +172,13 @@ project('spring-core') {
 
     jar {
         // inline all repackaged asm and cglib classes directly into the spring-core jar
-        from(asmRepackJar) {
-            exclude 'META-INF/**'
+        dependsOn asmRepackJar
+        from(zipTree(asmRepackJar.archivePath)) {
+            include 'org/springframework/asm/**'
         }
-        from(cglibRepackJar) {
-            exclude 'META-INF/**'
+        dependsOn cglibRepackJar
+        from(zipTree(cglibRepackJar.archivePath)) {
+            include 'org/springframework/cglib/**'
         }
     }
 }
diff --git a/src/dist/license.txt b/src/dist/license.txt
index 59efc2327a0..51003b54f16 100644
--- a/src/dist/license.txt
+++ b/src/dist/license.txt
@@ -202,10 +202,10 @@
 
 =======================================================================
 
-SPRING FRAMEWORK 3.2 SUBCOMPONENTS:
+SPRING FRAMEWORK ${version} SUBCOMPONENTS:
 
-Spring Framework 3.2 includes a number of subcomponents with
-separate copyright notices and license terms.  The product that
+Spring Framework ${version} includes a number of subcomponents
+with separate copyright notices and license terms. The product that
 includes this file does not necessarily use all the open source
 subcomponents referred to below. Your use of the source
 code for these subcomponents is subject to the terms and