diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index caa3be98dcaf..e3e6b240934d 100644
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -4,11 +4,11 @@
       <root url="file://$PROJECT_DIR$/lib/annotations/netty"/>
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.6.Final.Patched.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.9.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.6.Final.Patched-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.9.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
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 cb7414f00485..d48ede23beeb 100644
--- a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java
+++ b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class Launcher {
     
     // IDEA-120811; speeding up DefaultChannelIDd calculation for netty
     //if (Boolean.parseBoolean(System.getProperty("io.netty.random.id"))) {
-      System.setProperty("io.netty.machineId", "9e43d860");
+      System.setProperty("io.netty.machineId", "28:f0:76:ff:fe:16:65:0e");
       System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
       System.setProperty("io.netty.serviceThreadPrefix", "Netty");
     //}
diff --git a/lib/netty-all-4.1.6.Final.Patched.jar b/lib/netty-all-4.1.9.Final.jar
similarity index 56%
rename from lib/netty-all-4.1.6.Final.Patched.jar
rename to lib/netty-all-4.1.9.Final.jar
index b9ecf9be7c9c..67df93166357 100644
Binary files a/lib/netty-all-4.1.6.Final.Patched.jar and b/lib/netty-all-4.1.9.Final.jar differ
diff --git a/lib/src/netty-all-4.1.6.Final.Patched-sources.jar b/lib/src/netty-all-4.1.9.Final-sources.jar
similarity index 59%
rename from lib/src/netty-all-4.1.6.Final.Patched-sources.jar
rename to lib/src/netty-all-4.1.9.Final-sources.jar
index a6693c64dc92..39a7e76d5f07 100644
Binary files a/lib/src/netty-all-4.1.6.Final.Patched-sources.jar and b/lib/src/netty-all-4.1.9.Final-sources.jar differ
diff --git a/platform/platform-impl/src/com/intellij/util/io/netty.kt b/platform/platform-impl/src/com/intellij/util/io/netty.kt
index a09bbc552a7a..cb2c080c0f60 100644
--- a/platform/platform-impl/src/com/intellij/util/io/netty.kt
+++ b/platform/platform-impl/src/com/intellij/util/io/netty.kt
@@ -35,6 +35,7 @@ import io.netty.handler.codec.http.HttpHeaderNames
 import io.netty.handler.codec.http.HttpMethod
 import io.netty.handler.codec.http.HttpRequest
 import io.netty.handler.ssl.SslHandler
+import io.netty.resolver.ResolvedAddressTypes
 import io.netty.util.concurrent.GenericFutureListener
 import org.jetbrains.concurrency.AsyncPromise
 import org.jetbrains.concurrency.Promise
@@ -253,7 +254,7 @@ fun isLocalHost(host: String, onlyAnyOrLoopback: Boolean, hostsOnly: Boolean = f
     // be aware - on windows hosts file doesn't contain localhost
     // hosts can contain remote addresses, so, we check it
     if (hostsOnly && !InetAddresses.isInetAddress(host)) {
-      return io.netty.resolver.HostsFileEntriesResolver.DEFAULT.address(host).let { it != null && it.isLocal() }
+      return io.netty.resolver.HostsFileEntriesResolver.DEFAULT.address(host, ResolvedAddressTypes.IPV4_PREFERRED).let { it != null && it.isLocal() }
     }
     else {
       return true
diff --git a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
index 13f6cee0576c..538be2ed0684 100644
--- a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
+++ b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class BuiltInServer implements Disposable {
   static {
     // IDEA-120811
     if (SystemProperties.getBooleanProperty("io.netty.random.id", true)) {
-      System.setProperty("io.netty.machineId", "9e43d860");
+      System.setProperty("io.netty.machineId", "28:f0:76:ff:fe:16:65:0e");
       System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
       System.setProperty("io.netty.serviceThreadPrefix", "Netty ");
     }