diff --git a/build.xml b/build.xml
index 41e655ab5b..35ba719813 100644
--- a/build.xml
+++ b/build.xml
@@ -336,7 +336,7 @@
         <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependencyManagement>
           <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.5"/>
-          <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.1.2"/>
+          <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.2.0"/>
           <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/>
           <dependency groupId="com.google.guava" artifactId="guava" version="15.0"/>
           <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
diff --git a/lib/lz4-1.1.2.jar b/lib/lz4-1.1.2.jar
deleted file mode 100644
index a302e49bf7..0000000000
Binary files a/lib/lz4-1.1.2.jar and /dev/null differ
diff --git a/lib/lz4-1.2.0.jar b/lib/lz4-1.2.0.jar
new file mode 100644
index 0000000000..9cdebd24f1
Binary files /dev/null and b/lib/lz4-1.2.0.jar differ
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index ddc1853a0e..469f9a232e 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.jpountz.lz4.LZ4BlockInputStream;
-import net.jpountz.lz4.LZ4Decompressor;
+import net.jpountz.lz4.LZ4FastDecompressor;
 import net.jpountz.lz4.LZ4Factory;
 import net.jpountz.xxhash.XXHashFactory;
 import org.xerial.snappy.SnappyInputStream;
@@ -117,7 +117,7 @@ public class IncomingTcpConnection extends Thread
                 in = new DataInputStream(new SnappyInputStream(socket.getInputStream()));
             else
             {
-                LZ4Decompressor decompressor = LZ4Factory.fastestInstance().decompressor();
+                LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
                 Checksum checksum = XXHashFactory.fastestInstance().newStreamingHash32(OutboundTcpConnection.LZ4_HASH_SEED).asChecksum();
                 in = new DataInputStream(new LZ4BlockInputStream(socket.getInputStream(),
                                                                  decompressor,