diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 779f577ae2..5778214bd2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1512,6 +1512,18 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return false;
         }
+
+        public void RemoveXmlRPCHandler(string method)
+        {
+            lock (m_rpcHandlers)
+            {
+                if (m_rpcHandlers.ContainsKey(method))
+                {
+                    m_rpcHandlers.Remove(method);
+                }
+            }
+        }
+
         
         public bool RemoveLLSDHandler(string path, LLSDMethod handler)
         {
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 6e3cc49dc6..f7a4c40b15 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -118,6 +118,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         bool RemoveLLSDHandler(string path, LLSDMethod handler);
         
         void RemoveStreamHandler(string httpMethod, string path);
+
+        void RemoveXmlRPCHandler(string method);
         
         string GetHTTP404(string host);