diff --git a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java
index ff98bb7d3dda..c97c70705317 100644
--- a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java
+++ b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java
@@ -44,9 +44,11 @@ public class Launcher {
     final URLClassLoader jpsLoader = new URLClassLoader(urls.toArray(new URL[urls.size()]), Launcher.class.getClassLoader());
     
     // IDEA-120811; speeding up DefaultChannelIDd calculation for netty
-    final String id = UUID.randomUUID().toString();
-    System.setProperty("io.netty.machineId", id.substring(id.length() - 8));
-    System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
+    if (Boolean.parseBoolean(System.getProperty("io.netty.random.id"))) {
+      final String id = UUID.randomUUID().toString();
+      System.setProperty("io.netty.machineId", id.substring(id.length() - 8));
+      System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
+    }
 
     final Class<?> mainClass = jpsLoader.loadClass(mainClassName);
     final Method mainMethod = mainClass.getMethod("main", String[].class);
diff --git a/lib/netty-all-5.0.0.Alpha2.jar b/lib/netty-all-5.0.0.Alpha2.jar
index d4b646a22a83..6ce077fd8069 100644
Binary files a/lib/netty-all-5.0.0.Alpha2.jar and b/lib/netty-all-5.0.0.Alpha2.jar differ
diff --git a/lib/src/netty-all-5.0.0.Alpha2-sources.jar b/lib/src/netty-all-5.0.0.Alpha2-sources.jar
index 354781d9601a..499abce4cdd6 100644
Binary files a/lib/src/netty-all-5.0.0.Alpha2-sources.jar and b/lib/src/netty-all-5.0.0.Alpha2-sources.jar differ
diff --git a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
index de0c2b932427..208c285b6b86 100644
--- a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
+++ b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
@@ -17,6 +17,7 @@ package org.jetbrains.io;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.ActionCallback;
+import com.intellij.util.SystemProperties;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.BootstrapUtil;
 import io.netty.bootstrap.ServerBootstrap;
@@ -44,9 +45,11 @@ public final class NettyUtil {
 
   static {
     // IDEA-120811
-    String id = UUID.randomUUID().toString();
-    System.setProperty("io.netty.machineId", id.substring(id.length() - 8));
-    System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
+    if (SystemProperties.getBooleanProperty("io.netty.random.id", false)) {
+      String id = UUID.randomUUID().toString();
+      System.setProperty("io.netty.machineId", id.substring(id.length() - 8));
+      System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
+    }
   }
   
   public static void log(Throwable throwable, Logger log) {