diff --git a/CHANGES.txt b/CHANGES.txt
index e6c64a8e17..82699925cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.6
+ * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
* Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
* Compress only inter-dc traffic by default (CASSANDRA-8888)
* Add metrics to track write amplification (CASSANDRA-11420)
diff --git a/build.xml b/build.xml
index 802093674f..1855a1633a 100644
--- a/build.xml
+++ b/build.xml
@@ -408,7 +408,7 @@
-
+
diff --git a/lib/licenses/netty-all-4.0.23.Final.txt b/lib/licenses/netty-all-4.0.34.Final.txt
similarity index 100%
rename from lib/licenses/netty-all-4.0.23.Final.txt
rename to lib/licenses/netty-all-4.0.34.Final.txt
diff --git a/lib/netty-all-4.0.23.Final.jar b/lib/netty-all-4.0.23.Final.jar
deleted file mode 100644
index 0555a164d2..0000000000
Binary files a/lib/netty-all-4.0.23.Final.jar and /dev/null differ
diff --git a/lib/netty-all-4.0.34.Final.jar b/lib/netty-all-4.0.34.Final.jar
new file mode 100644
index 0000000000..590b429fbf
Binary files /dev/null and b/lib/netty-all-4.0.34.Final.jar differ