diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 7fd31a45d2a5..5233598e8385 100644
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Netty">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-3.5.7.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-3.5.8.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-3.5.7.Final-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-3.5.8.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index fe9441b2d4ee..ff02012c094d 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -233,7 +233,7 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license:
 libraryLicense(name: "XStream", version: "1.2.1", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html")
 libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html")
 libraryLicense(name: "protobuf", version: "2.3.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367")
-libraryLicense(name: "Netty", libraryName: "Netty", version: "3.5.7", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Netty", libraryName: "Netty", version: "3.5.8", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Kryo", libraryName: "Kryo", version: "1.04", license: "New BSD License", url: "http://code.google.com/p/kryo/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
 libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "1.0.4.1", license: "Apache 2.0", url: "http://code.google.com/p/snappy-java/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.0.11", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
diff --git a/lib/netty-3.5.7.Final.jar b/lib/netty-3.5.8.Final.jar
similarity index 77%
rename from lib/netty-3.5.7.Final.jar
rename to lib/netty-3.5.8.Final.jar
index fb05e766d5e0..e2e42a528e00 100644
Binary files a/lib/netty-3.5.7.Final.jar and b/lib/netty-3.5.8.Final.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 7e1ac032c8a0..d254215c9399 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -45,5 +45,5 @@ xmlrpc-2.0.jar
 xpp3-1.1.4-min.jar
 xstream.jar
 swingx-core-1.6.2.jar
-netty-3.5.7.Final.jar
+netty-3.5.8.Final.jar
 protobuf-2.4.1.jar
diff --git a/lib/src/netty-3.5.7.Final-sources.jar b/lib/src/netty-3.5.8.Final-sources.jar
similarity index 86%
rename from lib/src/netty-3.5.7.Final-sources.jar
rename to lib/src/netty-3.5.8.Final-sources.jar
index 88a573e2b6cd..76f306756017 100644
Binary files a/lib/src/netty-3.5.7.Final-sources.jar and b/lib/src/netty-3.5.8.Final-sources.jar differ