diff --git a/python/build/paths.nsi b/python/build/paths.nsi
index c180dc416806..f071dc3b7cf7 100644
--- a/python/build/paths.nsi
+++ b/python/build/paths.nsi
@@ -1,6 +1,6 @@
 ; Installer images
 !define IMAGES_LOCATION ${BASE_DIR}\python\build\resources
-!define LICENSE_FILE ${BASE_DIR}\python\license\PyCharm_Preview_License
-!define PRODUCT_PROPERTIES_FILE ${BASE_DIR}\out\pycharm\layout\bin\idea.properties
+;!define LICENSE_FILE ${BASE_DIR}\python\license\PyCharm_Preview_License
+!define PRODUCT_PROPERTIES_FILE ${BASE_DIR}\out\pycharmCE\layout\bin\idea.properties
 !define PRODUCT_VM_OPTIONS_NAME pycharm.exe.vmoptions
-!define PRODUCT_VM_OPTIONS_FILE ${BASE_DIR}\out\pycharm\win\bin\${PRODUCT_VM_OPTIONS_NAME}
\ No newline at end of file
+!define PRODUCT_VM_OPTIONS_FILE ${BASE_DIR}\out\pycharmCE\win\bin\${PRODUCT_VM_OPTIONS_NAME}
diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 1a2103d42f1a..196bb21982aa 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -43,6 +43,7 @@ class Paths {
 
   def Paths(String home) {
     sandbox = "$home/out/pycharm"
+    sandboxCE = "$home/out/pycharmCE"
 
     distAll = "$sandbox/layout"
     distWin = "$sandbox/win"
@@ -165,13 +166,17 @@ private communityEdition(Set usedJars) {
   s.setBinding(binding)
 
   s.layoutCommunity("${paths.sandbox}/classes/production", usedJars)
+  signExe("${paths.sandboxCE}/win/bin/pycharm.exe")
+  buildNSIS(["${paths.sandboxCE}/layout", "${paths.sandboxCE}/win"],
+            "$pythonCommunityHome/build/strings.nsi", "$pythonCommunityHome/build/paths.nsi",
+            "pycharm", false, true, system_selector)
 
   // todo: get rid of copying
-  //ant.copy(file: "$paths.artifacts/ideaIC-${buildNumber}.mac.zip", tofile: "$paths.artifacts/ideaIC-${buildNumber}.sit")
-  //def extraArgs = ["build.number": "IC-$buildNumber"]
-  //signMacZip("idea", extraArgs)
-  //notifyArtifactBuilt("$paths.artifacts/ideaIC-${buildNumber}.sit")
-  //buildDmg("idea", getDmgImage(true), extraArgs)
+  //ant.copy(file: "${paths.sandboxCE}/artifacts/ideaIC-${buildNumber}.mac.zip", tofile: "$paths.artifacts/ideaIC-${buildNumber}.sit")
+  def extraArgs = ["build.number": "PC-$buildNumber"]
+  signMacZip("pycharm", extraArgs)
+  notifyArtifactBuilt("$paths.artifacts/ideaIC-${buildNumber}.sit")
+  buildDmg("pycharm", "${home}/python/build/DMG_background.png", extraArgs)
   //ant.delete(file: "$paths.artifacts/ideaIC-${buildNumber}.sit")
 }
 
diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index e99cb84df771..5bd43f1e34bf 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -50,7 +50,7 @@ class Paths {
     distWin = "$sandbox/win"
     distMac = "$sandbox/mac"
     distUnix = "$sandbox/unix"
-    artifacts = "$home/out/pycharmCE/artifacts"
+    artifacts = "$sandbox/artifacts"
 
     ideaSystem = "$sandbox/system"
     ideaConfig = "$sandbox/config"
diff --git a/python/build/strings.nsi b/python/build/strings.nsi
index 9e533d35d720..ed2dd29b1c1a 100644
--- a/python/build/strings.nsi
+++ b/python/build/strings.nsi
@@ -1,6 +1,6 @@
 !define MANUFACTURER "JetBrains"
-!define MUI_PRODUCT  "PyCharm"
-!define PRODUCT_FULL_NAME "JetBrains PyCharm"
+!define MUI_PRODUCT  "PyCharm Community Edition"
+!define PRODUCT_FULL_NAME "JetBrains PyCharm Community Edition"
 !define PRODUCT_EXE_FILE "pycharm.exe"
 !define PRODUCT_ICON_FILE "pycharm_inst.ico"
 !define PRODUCT_UNINST_ICON_FILE "pycharm_uninst.ico"