diff --git a/python/build/paths.nsi b/python/build/paths.nsi
new file mode 100644
index 000000000000..a16a85d6a505
--- /dev/null
+++ b/python/build/paths.nsi
@@ -0,0 +1,7 @@
+; Installer images
+!define IMAGES_LOCATION ${BASE_DIR}\python\build\resources
+!define LICENSE_FILE ${BASE_DIR}\ruby\license\RubyMine_license
+!define PRODUCT_PROPERTIES_FILE ${BASE_DIR}\python\build\idea.properties
+!define PRODUCT_VM_OPTIONS_NAME python.exe.vmoptions
+!define PRODUCT_VM_OPTIONS_FILE ${BASE_DIR}\python\build\${PRODUCT_VM_OPTIONS_NAME}
+!define PRODUCT_SETTINGS_DIR .PyCharm
diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index eba414540870..00e7282f74d2 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -20,7 +20,7 @@ setProperty("pluginFilter", [
         "JSInspections",
         "JSIntentionPowerPack",
         "SpellChecker", "spellchecker",
-        "yaml"
+        "yaml", "yaml-plugin"
 ])
 
 private List platformImplementationModules() {
@@ -156,6 +156,12 @@ target('default': "Build artifacts") {
       include(name: "Contents/MacOS/idea")
     }
   }
+
+  def installer = includeFile("nsis_installer.gant")
+  installer.nsis_installer(["$sandbox/layout"],
+                           "$home/python/build/strings.nsi",
+                           "$home/build/conf/nsis/paths.nsi",
+                           "PyCharmPY-")
 }
 
 String appInfoFile() {
diff --git a/python/build/resources/headerlogo.bmp b/python/build/resources/headerlogo.bmp
new file mode 100644
index 000000000000..7b85c110c7f6
Binary files /dev/null and b/python/build/resources/headerlogo.bmp differ
diff --git a/python/build/resources/logo.bmp b/python/build/resources/logo.bmp
new file mode 100644
index 000000000000..0a729442070c
Binary files /dev/null and b/python/build/resources/logo.bmp differ
diff --git a/python/build/resources/pycharm_inst.ico b/python/build/resources/pycharm_inst.ico
new file mode 100644
index 000000000000..ef00183e2990
Binary files /dev/null and b/python/build/resources/pycharm_inst.ico differ
diff --git a/python/build/resources/pycharm_uninst.ico b/python/build/resources/pycharm_uninst.ico
new file mode 100644
index 000000000000..481328c427c4
Binary files /dev/null and b/python/build/resources/pycharm_uninst.ico differ
diff --git a/python/build/strings.nsi b/python/build/strings.nsi
new file mode 100644
index 000000000000..eea8802de3b7
--- /dev/null
+++ b/python/build/strings.nsi
@@ -0,0 +1,14 @@
+!define MANUFACTURER "JetBrains"
+!define MUI_PRODUCT  "PyCharm"
+!define PRODUCT_FULL_NAME "JetBrains PyCharm"
+!define OUT_NAME_PREFIX "pycharm"
+!define PRODUCT_EXE_FILE "pycharm.exe"
+!define PRODUCT_ICON_FILE "pycharm_inst.ico"
+!define PRODUCT_UNINST_ICON_FILE "pycharm_uninst.ico"
+!define PRODUCT_LOGO_FILE "logo.bmp"
+!define PRODUCT_HEADER_FILE "headerlogo.bmp"
+
+; if SHOULD_SET_DEFAULT_INSTDIR != 0 then default installation directory will be directory where highest-numbered RubyMine build has been installed
+; set to 1 for release build
+!define SHOULD_SET_DEFAULT_INSTDIR "0"
+