diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index b916b9f6239..28eb5f32a05 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -185,8 +185,9 @@
 
       <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
 
-      <referencesSearch implementation="org.jetbrains.jet.plugin.references.KotlinReferencesSearcher"/>
-      <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.references.KotlinDirectInheritorsSearcher"/>
+      <referencesSearch implementation="org.jetbrains.jet.plugin.search.KotlinReferencesSearcher"/>
+      <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDirectInheritorsSearcher"/>
+      <definitionsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDefinitionsSearcher"/>
 
       <toolWindow id="Kotlin"
                   factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java
new file mode 100644
index 00000000000..9d29c7478fe
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2012 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 org.jetbrains.jet.plugin.search;
+
+import com.intellij.openapi.application.QueryExecutorBase;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.search.searches.ClassInheritorsSearch;
+import com.intellij.util.Processor;
+import com.intellij.util.Query;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.asJava.JetLightClass;
+import org.jetbrains.jet.lang.psi.JetClass;
+
+/**
+ * @author yole
+ */
+public class KotlinDefinitionsSearcher extends QueryExecutorBase<PsiElement, PsiElement> {
+    @Override
+    public void processQuery(@NotNull PsiElement queryParameters, @NotNull final Processor<PsiElement> consumer) {
+        if (queryParameters instanceof JetClass) {
+            final JetLightClass psiClass = JetLightClass.wrapDelegate((JetClass) queryParameters);
+            final Query<PsiClass> query = ClassInheritorsSearch.search(psiClass, true);
+            query.forEach(new Processor<PsiClass>() {
+              @Override
+              public boolean process(final PsiClass pyClass) {
+                return consumer.process(pyClass);
+              }
+            });
+        }
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/references/KotlinDirectInheritorsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinDirectInheritorsSearcher.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/references/KotlinDirectInheritorsSearcher.java
rename to idea/src/org/jetbrains/jet/plugin/search/KotlinDirectInheritorsSearcher.java
index cc505252f36..63b1f90af81 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/KotlinDirectInheritorsSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinDirectInheritorsSearcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.references;
+package org.jetbrains.jet.plugin.search;
 
 import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.psi.PsiClass;
diff --git a/idea/src/org/jetbrains/jet/plugin/references/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/references/KotlinReferencesSearcher.java
rename to idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
index 149b0b44428..ffb166ab29b 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/KotlinReferencesSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.references;
+package org.jetbrains.jet.plugin.search;
 
 import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.psi.PsiElement;