diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 0e74cf11042a..8017d1154098 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -884,23 +884,21 @@ binding.setVariable("bundledJDK64s"){
 private bundledJDK(boolean win64) {
   requireProperty("artifact.linux.no.jdk", "true")
   requireProperty("artifact.mac.no.jdk", "true")
-  requireProperty("jdk.win", "jdk1.8")
-  requireProperty("jdk.custom.win", "false")
-  requireProperty("jdk.mac", "openjdk.1.8")
+  requireProperty("jdk.oracle.win", "jdk1.8")
+  requireProperty("jdk.win",   "openjdk.1.8")
+  requireProperty("jdk.mac",   "openjdk.1.8")
   requireProperty("jdk.linux", "openjdk.1.8")
 
   if (new File("${home}/build/jdk").exists()) {
     def jdkDir = new File("${home}/build/jdk/win")
-    if (p("jdk.win") != "false") {
-      setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.win"), (win64 ? "x64.zip": "x32.zip") ))
-      extractRedistJre(winJDK, "${paths.sandbox}/jdk.win/jre")
+    if (p("jdk.oracle.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
+      setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.oracle.win"), (win64 ? "x64.zip": "x32.zip")))
+      extractRedistJre(winJDK, "${paths.sandbox}/jdk.oracle.win/jre")
     }
     jdkDir = new File("${home}/build/jdk/win/custom")
-    if (p("jdk.custom.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
-      setProperty("winCustomJDKx32", getPathToBundledJDK(jdkDir, p("jdk.custom.win"), "x32.tar.gz"))
-      extractRedistJre(winCustomJDKx32, "${paths.sandbox}/jdk.custom.win.x32")
-      setProperty("winCustomJDKx64", getPathToBundledJDK(jdkDir, p("jdk.custom.win"), "x64.tar.gz"))
-      extractRedistJre(winCustomJDKx64, "${paths.sandbox}/jdk.custom.win.x64")
+    if (p("jdk.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
+      setProperty("winCustomJDKx32", getPathToBundledJDK(jdkDir, p("jdk.win"), (win64 ? "x64.tar.gz": "x32.tar.gz")))
+      extractRedistJre(winCustomJDKx32, "${paths.sandbox}/jdk.win")
     }
     jdkDir = new File("${home}/build/jdk/mac/custom")
     if (p("jdk.mac") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index ee43535231dd..6213ba96fcb2 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -175,6 +175,11 @@ public layoutCommunity(String classesPath, Set usedJars) {
   List pathsDist = new File("${home}/out/pycharm/jdk.win/jre").exists() ? [paths.distAll, paths.distWin, "${home}/out/pycharm/jdk.win"] : [paths.distAll, paths.distWin]
   buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}.zip", pathsDist)
 
+  //win oracle jdk
+  if (new File("${home}/out/pycharm/jdk.oracle.win/jre").exists()) {
+    buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}-oracle-win.zip", [paths.distAll, paths.distWin, "${home}/out/pycharm/jdk.oracle.win"])
+  }
+
   String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
   buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}-no-jdk.tar", [paths.distAll, paths.distUnix])
   requireProperty("jdk.linux", "false")
diff --git a/python/educational-python/build/pycharm_edu_build.gant b/python/educational-python/build/pycharm_edu_build.gant
index d78efb76507b..b9219f85552f 100644
--- a/python/educational-python/build/pycharm_edu_build.gant
+++ b/python/educational-python/build/pycharm_edu_build.gant
@@ -210,6 +210,10 @@ public layoutEducational(String classesPath, Set usedJars) {
   buildNSIS([paths.distAll, paths.distWin],
             "$pythonEduHome/build/strings.nsi", "$pythonEduHome/build/paths.nsi",
             "pycharmEDU-", false, true, system_selector)
+  //win oracle jdk
+  if (new File("${home}/out/pycharm/jdk.oracle.win/jre").exists()) {
+    buildWinZip("${paths.artifacts}/pycharm${buildName}-oracle-win.zip", [paths.distAll, paths.distWin, "${home}/out/pycharm/jdk.oracle.win"])
+  }
 
   String tarRoot = isEap() ? "pycharm-edu-$buildNumber" : "pycharm-edu-${p("component.version.major")}.${p("component.version.minor")}"
   buildTarGz(tarRoot, "$paths.artifacts/pycharm${buildName}-no-jdk.tar", [paths.distAll, paths.distUnix])