diff --git a/lib/src/xmlrpc2.src.zip b/lib/src/xmlrpc2.src.zip
new file mode 100644
index 000000000000..ac0278599250
Binary files /dev/null and b/lib/src/xmlrpc2.src.zip differ
diff --git a/lib/xmlrpc-2.0.jar b/lib/xmlrpc-2.0.jar
index 47b46375e3b7..acaacd8a3129 100644
Binary files a/lib/xmlrpc-2.0.jar and b/lib/xmlrpc-2.0.jar differ
diff --git a/source/com/intellij/ide/XmlRpcServerImpl.java b/source/com/intellij/ide/XmlRpcServerImpl.java
index a4ff1643bdb6..721897a93db8 100644
--- a/source/com/intellij/ide/XmlRpcServerImpl.java
+++ b/source/com/intellij/ide/XmlRpcServerImpl.java
@@ -5,10 +5,7 @@ package com.intellij.ide;
 
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.diagnostic.Logger;
-import org.apache.xmlrpc.WebServer;
-import org.apache.xmlrpc.XmlRpcContext;
-import org.apache.xmlrpc.XmlRpcRequestProcessor;
-import org.apache.xmlrpc.XmlRpcWorker;
+import org.apache.xmlrpc.*;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,37 +33,7 @@ public class XmlRpcServerImpl implements XmlRpcServer, ApplicationComponent {
     if (!checkPort()) return;
 
     try {
-      myWebServer = new WebServer(getPortNumber(), null, new org.apache.xmlrpc.XmlRpcServer(){
-        protected XmlRpcWorker createWorker() {
-          return new XmlRpcWorker(getHandlerMapping()){
-
-            public byte[] execute(InputStream inputStream, String string, String string1) {
-              try {
-                return super
-                  .execute(inputStream, string, string1);
-              }
-              finally {
-                resetRequestProcessor();
-              }
-            }
-
-            public byte[] execute(InputStream inputStream, XmlRpcContext xmlRpcContext) {
-              try {
-                return super
-                  .execute(inputStream, xmlRpcContext);
-              }
-              finally {
-                resetRequestProcessor();
-              }
-            }
-
-            private void resetRequestProcessor() {
-              requestProcessor = new XmlRpcRequestProcessor();
-            }
-          };
-        }
-
-      });
+      myWebServer = new IdeaAwareWebServer(getPortNumber(), null, new IdeaAwareXmlRpcServer());
       myWebServer.start();
     }
     catch (Exception e) {