diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 0d0f840e2724..3732490c7e8a 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.1.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-3.5.5.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-3.5.1.Final-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-3.5.5.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/netty-3.5.1.Final.jar b/lib/netty-3.5.5.Final.jar
similarity index 66%
rename from lib/netty-3.5.1.Final.jar
rename to lib/netty-3.5.5.Final.jar
index 2c6f4b05b710..39fa449df156 100644
Binary files a/lib/netty-3.5.1.Final.jar and b/lib/netty-3.5.5.Final.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index b734fa5b346d..b0e3e3ad1179 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.1.Final.jar
+netty-3.5.5.Final.jar
 protobuf-2.4.1.jar
diff --git a/lib/src/netty-3.5.1.Final-sources.jar b/lib/src/netty-3.5.5.Final-sources.jar
similarity index 73%
rename from lib/src/netty-3.5.1.Final-sources.jar
rename to lib/src/netty-3.5.5.Final-sources.jar
index 8e84d9b582e8..c421a37672f9 100644
Binary files a/lib/src/netty-3.5.1.Final-sources.jar and b/lib/src/netty-3.5.5.Final-sources.jar differ