diff --git a/.idea/libraries/CGLIB.xml b/.idea/libraries/CGLIB.xml
index 4b574fe43b94..23bbd886aca8 100644
--- a/.idea/libraries/CGLIB.xml
+++ b/.idea/libraries/CGLIB.xml
@@ -1,11 +1,12 @@
 <component name="libraryTable">
   <library name="CGLIB">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cglib-2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cglib-2.2.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.2.jar!/src/proxy" />
+      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.2.2.jar!/src/proxy" />
+      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.2.2.jar!/src/test" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index cd0eca57fecf..28f31f83e692 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -154,7 +154,7 @@ libraryLicense(name: "Alloy L&F", libraryName: "alloy.jar", version: "1.4.4", li
 libraryLicense(name: "Ant", version: "1.7", license: "Apache 2.0", url: "http://ant.apache.org/", licenseUrl: "http://ant.apache.org/license.html")
 libraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "asm", version: "3.3", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
 libraryLicense(name: "Axis", libraryName: "axis-1.4", version: "1.4", license: "Apache 2.0", url: "http://ws.apache.org/axis/", licenseUrl: "http://svn.jetbrains.org/idea/Trunk/bundled/WebServices/resources/lib/axis-1.4.0/axis.LICENSE")
-libraryLicense(name: "CGLib", libraryName: "CGLIB", version: "2.2", license: "Apache", url: "http://cglib.sourceforge.net/", licenseUrl: "http://www.apache.org/foundation/licence-FAQ.html")
+libraryLicense(name: "CGLib", libraryName: "CGLIB", version: "2.2.2", license: "Apache", url: "http://cglib.sourceforge.net/", licenseUrl: "http://www.apache.org/foundation/licence-FAQ.html")
 libraryLicense(name: "classworlds", libraryName: "classworlds-1.1.jar", version: "1.1", license: "codehaus", url: "http://classworlds.codehaus.org/", licenseUrl: "http://classworlds.codehaus.org/license.html")
 libraryLicense(name: "Android SDK Tools", libraryName: "android-sdk-tools", license: "Apache 2.0", url: "http://source.android.com/")
 libraryLicense(name: "Apache Commons BeanUtils", libraryName: "commons-beanutils.jar", version: "1.6", license: "Apache 2.0", url: "http://commons.apache.org/beanutils/")
diff --git a/lib/cglib-2.2.2.jar b/lib/cglib-2.2.2.jar
new file mode 100644
index 000000000000..564b9f8834e3
Binary files /dev/null and b/lib/cglib-2.2.2.jar differ
diff --git a/lib/cglib-2.2.jar b/lib/cglib-2.2.jar
deleted file mode 100644
index 084ef6e54b51..000000000000
Binary files a/lib/cglib-2.2.jar and /dev/null differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 6dd33f7bcbf9..ac2d8cf57f82 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -2,7 +2,7 @@ asm-commons.jar
 asm.jar
 automaton.jar
 cli-10.jar
-cglib-2.2.jar
+cglib-2.2.2.jar
 commons-codec-1.3.jar
 commons-collections.jar
 commons-httpclient-3.1-patched.jar
diff --git a/lib/src/cglib-src-2.2.jar b/lib/src/cglib-src-2.2.2.jar
similarity index 88%
rename from lib/src/cglib-src-2.2.jar
rename to lib/src/cglib-src-2.2.2.jar
index 4a32ba9861ef..ef9a73a672ef 100644
Binary files a/lib/src/cglib-src-2.2.jar and b/lib/src/cglib-src-2.2.2.jar differ
diff --git a/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java b/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java
index 666bec9f3783..7f77a0a50018 100644
--- a/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java
+++ b/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java
@@ -989,6 +989,12 @@ public class AdvancedEnhancer extends AbstractClassGenerator
       public Signature getImplSignature(MethodInfo method) {
         return rename(method.getSignature(), (Integer)positions.get(method));
       }
+
+      @Override
+      public void emitInvoke(CodeEmitter codeEmitter, MethodInfo methodInfo) {
+        codeEmitter.super_invoke(methodInfo.getSignature());
+      }
+
       public CodeEmitter beginMethod(ClassEmitter ce, MethodInfo method) {
         CodeEmitter e = EmitUtils.begin_method(ce, method);
         if (!interceptDuringConstruction &&