diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index b03c6c74c601..d6014a7bdeb4 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -60,9 +60,15 @@ boolean isEap() {
 class Paths {
   final sandbox
   final artifacts
+  final ideaSystem
+  final ideaConfig
 
   def Paths(String home) {
     sandbox = "$home/out/pycharm"
+
+    ideaSystem = "$sandbox/system"
+    ideaConfig = "$sandbox/config"
+
     artifacts = "$home/out/artifacts"
   }
 }
@@ -148,6 +154,7 @@ target('default': "Build artifacts") {
     }
   }
 
+  build_searchable_options()
   wire_build_date(buildName)
   layoutFull(
           buildName: buildName,
@@ -187,6 +194,26 @@ target('default': "Build artifacts") {
                            "pycharm", false)
 }
 
+def build_searchable_options() {
+  def dest_dir = "${project ["platform-resources"].output}/search"
+  project.stage("Building searchable options")
+  ant.mkdir(dir: "${dest_dir}/search")
+  ant.copy(file: "$home/build/idea.license", todir: paths.ideaSystem)
+  ant.copy(file: "$home/build/rubymine.license", todir: paths.ideaSystem)
+  ant.java(classname: "com.intellij.idea.Main", fork: "true") {
+    jvmarg(line: "-ea -Xmx250m -Didea.home.path=$home -Didea.system.path=${paths.ideaSystem} -Didea.config.path=${paths.ideaConfig} -Didea.platform.prefix=Python")
+    jvmarg(value: "-Xbootclasspath/a:${boot.output}")
+    arg(line: "traverseUI ${dest_dir}/searchableOptions.xml")
+
+    classpath() {
+      pathelement(location: "$ch/lib/junit.jar")
+      project["python-ide"].runtimeClasspath().each {
+        pathelement(location: it)
+      }
+    }
+  }
+}
+
 String appInfoFile() {
   return "$home/out/pycharm/classes/production/python-ide/idea/PythonApplicationInfo.xml"
 }
@@ -289,7 +316,7 @@ def layoutWin(String target) {
   layout(target) {
     dir("bin") {
       fileset(dir: "$home/bin") {
-        include(name: "libyjpagent.dll")
+        include(name: "jpagent.dll")
       }
       fileset(dir: "$home/python/build") {
         include(name: "pycharm.bat")
diff --git a/python/python-ide.iml b/python/python-ide.iml
index 22129ccc5b1b..9d2fc4bbe1b8 100644
--- a/python/python-ide.iml
+++ b/python/python-ide.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="python" />
     <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="xdebugger-impl" scope="RUNTIME" />
   </component>
 </module>