diff --git a/java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java b/java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java
new file mode 100644
index 000000000000..878b911b26f8
--- /dev/null
+++ b/java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.intellij.execution.filters;
+
+/**
+ * @author Gregory.Shrago
+ */
+public class RmiStackFrameFilter extends StackFrameFilter {
+  public boolean isAuxiliaryFrame(String className, String methodName) {
+    if (className.startsWith("java.rmi.") && methodName.startsWith("invoke")) {
+      return true;
+    }
+    return className.startsWith("sun.rmi.");
+  }
+}
\ No newline at end of file
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index d9dfefb3635d..9f5149136e20 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -724,6 +724,7 @@
     <console.folding implementation="com.intellij.execution.filters.AuxiliaryCallsFolding"/>
 
     <stackFrameFilter implementation="com.intellij.execution.filters.ReflectionStackFrameFilter"/>
+    <stackFrameFilter implementation="com.intellij.execution.filters.RmiStackFrameFilter"/>
 
     <quoteHandler fileType="JAVA" className="com.intellij.codeInsight.editorActions.JavaQuoteHandler"/>
     <typedHandler implementation="com.intellij.codeInsight.editorActions.JavaTypedHandler" id="java"/>