diff --git a/pom.xml b/pom.xml
index 25f6fb1..afe9c4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
-      <version>4.0.39.Final</version>
+      <version>4.1.19.Final</version>
     </dependency>
 
     <dependency>
@@ -151,7 +151,7 @@
       <version>19.0</version>
     </dependency>
 
-    <dependency>
+    <dependency>                       
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>2.6.4</version>
@@ -173,7 +173,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <version>1.1.33.Fork18</version>
+      <version>2.0.7.Final</version>
       <classifier>${os.detected.classifier}</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/src/main/java/com/github/brainlag/nsq/netty/NSQFeatureDetectionHandler.java b/src/main/java/com/github/brainlag/nsq/netty/NSQFeatureDetectionHandler.java
index e9bf452..71b610b 100644
--- a/src/main/java/com/github/brainlag/nsq/netty/NSQFeatureDetectionHandler.java
+++ b/src/main/java/com/github/brainlag/nsq/netty/NSQFeatureDetectionHandler.java
@@ -7,8 +7,8 @@
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-import io.netty.handler.codec.compression.SnappyFramedDecoder;
-import io.netty.handler.codec.compression.SnappyFramedEncoder;
+import io.netty.handler.codec.compression.SnappyFrameDecoder;
+import io.netty.handler.codec.compression.SnappyFrameEncoder;
 import io.netty.handler.codec.compression.ZlibCodecFactory;
 import io.netty.handler.codec.compression.ZlibWrapper;
 import io.netty.handler.ssl.SslHandler;
@@ -59,7 +59,7 @@ protected void channelRead0(final ChannelHandlerContext ctx, final NSQFrame msg)
                 sslHandler.setSingleDecode(true);
                 pipeline.addBefore("LengthFieldBasedFrameDecoder", "SSLHandler", sslHandler);
                 if (snappy) {
-                    pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFramedEncoder());
+                    pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFrameEncoder());
                 }
                 if (deflate) {
                     pipeline.addBefore("NSQEncoder", "DeflateEncoder", ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE,
@@ -67,7 +67,7 @@ protected void channelRead0(final ChannelHandlerContext ctx, final NSQFrame msg)
                 }
             }
             if (!ssl && snappy) {
-                pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFramedEncoder());
+                pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFrameEncoder());
                 reinstallDefaultDecoder = installSnappyDecoder(pipeline);
             }
             if (!ssl && deflate) {
@@ -102,7 +102,7 @@ private boolean installDeflateDecoder(final ChannelPipeline pipeline, final Conn
     private boolean installSnappyDecoder(final ChannelPipeline pipeline) {
         finished = true;
         LogManager.getLogger(this).info("Adding snappy to pipline");
-        pipeline.replace("LengthFieldBasedFrameDecoder", "SnappyDecoder", new SnappyFramedDecoder());
+        pipeline.replace("LengthFieldBasedFrameDecoder", "SnappyDecoder", new SnappyFrameDecoder());
         return false;
     }