diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 33740962d245..65b31a10b6d9 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.1.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.4.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.1.Final-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.4.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/netty-all-4.1.1.Final.jar b/lib/netty-all-4.1.4.Final.jar
similarity index 51%
rename from lib/netty-all-4.1.1.Final.jar
rename to lib/netty-all-4.1.4.Final.jar
index 28d8fdd1a4e2..4722a17b955d 100644
Binary files a/lib/netty-all-4.1.1.Final.jar and b/lib/netty-all-4.1.4.Final.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index dc9fca43a0a1..35e36f0a0a99 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -51,7 +51,7 @@ miglayout-core-5.0.jar
 miglayout-swing-5.0.jar
 nanoxml-2.2.3.jar
 nekohtml-1.9.14.jar
-netty-all-4.1.1.Final.jar
+netty-all-4.1.4.Final.jar
 oromatcher.jar
 picocontainer.jar
 protobuf-2.5.0.jar
diff --git a/lib/src/netty-all-4.1.1.Final-sources.jar b/lib/src/netty-all-4.1.4.Final-sources.jar
similarity index 71%
rename from lib/src/netty-all-4.1.1.Final-sources.jar
rename to lib/src/netty-all-4.1.4.Final-sources.jar
index bf07fc1f4496..ceed0c9faeeb 100644
Binary files a/lib/src/netty-all-4.1.1.Final-sources.jar and b/lib/src/netty-all-4.1.4.Final-sources.jar differ