diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityBuilder.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityBuilder.groovy
index f8deb6206539..08565483e9e6 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityBuilder.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityBuilder.groovy
@@ -18,7 +18,6 @@ package org.jetbrains.intellij.build.pycharm
 import org.codehaus.gant.GantBinding
 import org.jetbrains.intellij.build.BuildContext
 import org.jetbrains.intellij.build.BuildTasks
-import org.jetbrains.intellij.build.JetBrainsBuildTools
 
 /**
  * @author nik
@@ -34,10 +33,8 @@ class PyCharmCommunityBuilder {
 
   def build() {
     def buildContext = BuildContext.createContext(binding.ant, binding.projectBuilder, binding.project, binding.global,
-                                                  "$home/community", home, "$home/out/pycharmCE", new PyCharmCommunityProperties(home),
-                                                  JetBrainsBuildTools.create("$home/build/lib/jet-sign.jar"))
+                                                  home, home, "$home/out/pycharmCE", new PyCharmCommunityProperties(home))
     def buildTasks = BuildTasks.create(buildContext)
     buildTasks.compileModulesAndBuildDistributions()
-    buildTasks.zipProjectSources()
   }
 }
\ No newline at end of file
diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
index a547c0bfa04e..35dbbbde9cc3 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
@@ -21,18 +21,18 @@ import org.jetbrains.intellij.build.*
  * @author nik
  */
 class PyCharmCommunityProperties extends PyCharmPropertiesBase {
-  PyCharmCommunityProperties(String home) {
+  PyCharmCommunityProperties(String communityHome) {
     productCode = "PC"
     platformPrefix = "PyCharmCore"
     applicationInfoModule = "python-community-ide-resources"
-    brandingResourcePaths = ["$home/community/python/resources"]
+    brandingResourcePaths = ["$communityHome/python/resources"]
 
     productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["dom-openapi"]
     productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + [
       "dom-impl", "python-community", "python-community-ide-resources",
       "python-ide-community", "python-community-configure", "python-openapi", "python-psi-api", "platform-main"
     ]
-    productLayout.bundledPluginModules = new File("$home/community/python/build/plugin-list.txt").readLines()
+    productLayout.bundledPluginModules = new File("$communityHome/python/build/plugin-list.txt").readLines()
     productLayout.mainModule = "main_pycharm_ce"
   }
 
@@ -60,7 +60,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
     return new PyCharmWindowsDistributionCustomizer() {
       {
         buildZipWithBundledOracleJre = true
-        installerImagesPath = "$projectHome/community/python/build/resources"
+        installerImagesPath = "$projectHome/python/build/resources"
         fileAssociations = [".py"]
       }
 
@@ -81,7 +81,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
   LinuxDistributionCustomizer createLinuxCustomizer(String projectHome) {
     return new LinuxDistributionCustomizer() {
       {
-        iconPngPath = "$projectHome/community/python/resources/PyCharmCore128.png"
+        iconPngPath = "$projectHome/python/resources/PyCharmCore128.png"
       }
       @Override
       String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) {
@@ -99,10 +99,10 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
   MacDistributionCustomizer createMacCustomizer(String projectHome) {
     return new PyCharmMacDistributionCustomizer() {
       {
-        icnsPath = "$projectHome/community/python/resources/PyCharmCore.icns"
+        icnsPath = "$projectHome/python/resources/PyCharmCore.icns"
         bundleIdentifier = "com.jetbrains.pycharm"
         helpId = "PY"
-        dmgImagePath = "$projectHome/community/python/build/DMG_background.png"
+        dmgImagePath = "$projectHome/python/build/DMG_background.png"
       }
 
       @Override
diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
index 6d943a653f88..422a38a56bde 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
@@ -53,9 +53,9 @@ abstract class PyCharmPropertiesBase extends ProductProperties {
     tasks.zipSourcesOfModules(["python-openapi", "python-psi-api"], "$targetDirectory/lib/src/pycharm-openapi-src.zip")
 
     context.ant.copy(todir: "$targetDirectory/helpers") {
-      fileset(dir: "$context.paths.projectHome/community/python/helpers")
+      fileset(dir: "$context.paths.communityHome/python/helpers")
     }
-    context.ant.copy(todir: "$targetDirectory/help") {
+    context.ant.copy(todir: "$targetDirectory/help", failonerror: false) {
       fileset(dir: "$context.paths.projectHome/python/help") {
         include(name: "*.pdf")
       }
diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index 78b902fd3467..09f929e74ad1 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -5,8 +5,7 @@ import org.jetbrains.jps.idea.IdeaProjectLoader
 includeTool << JpsGantTool
 
 target("default": "Default") {
-  String home = new File(IdeaProjectLoader.guessHome(this)).parentFile.absolutePath
-  BuildUtils.addToClassPath("$home/build/groovy", ant)
-  BuildUtils.addToClassPath("$home/community/python/build/groovy", ant)
+  String home = new File(IdeaProjectLoader.guessHome(this)).absolutePath
+  BuildUtils.addToClassPath("$home/python/build/groovy", ant)
   Class.forName("org.jetbrains.intellij.build.pycharm.PyCharmCommunityBuilder").constructors[0].newInstance(home, binding).build()
 }
diff --git a/python/build/python-community-build.iml b/python/build/python-community-build.iml
index 1ecb47b47e83..05344263d5ea 100644
--- a/python/build/python-community-build.iml
+++ b/python/build/python-community-build.iml
@@ -10,6 +10,5 @@
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="jps-standalone-builder" />
     <orderEntry type="module" module-name="build" />
-    <orderEntry type="module" module-name="buildScripts" />
   </component>
 </module>
\ No newline at end of file