diff --git a/CHANGES.txt b/CHANGES.txt
index 329e55cfbc..43d1c3c342 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * Update Netty to 4.0.36 (CASSANDRA-11567)
  * Fix PER PARTITION LIMIT for queries requiring post-query ordering (CASSANDRA-11556)
  * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
  * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
diff --git a/build.xml b/build.xml
index c6b2246a8a..034fb29ee6 100644
--- a/build.xml
+++ b/build.xml
@@ -411,7 +411,7 @@
           <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.0" />
           <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
           <dependency groupId="io.airlift" artifactId="airline" version="0.6" />
-          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.34.Final" />
+          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.36.Final" />
           <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
           <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
           <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.0" classifier="shaded" />
diff --git a/lib/netty-all-4.0.34.Final.jar b/lib/netty-all-4.0.36.Final.jar
similarity index 67%
rename from lib/netty-all-4.0.34.Final.jar
rename to lib/netty-all-4.0.36.Final.jar
index 590b429fbf..5e278c4dbe 100644
Binary files a/lib/netty-all-4.0.34.Final.jar and b/lib/netty-all-4.0.36.Final.jar differ