diff -Nru netty-4.1.7/debian/changelog netty-4.1.7/debian/changelog
--- netty-4.1.7/debian/changelog	2017-01-23 08:32:14.000000000 +0000
+++ netty-4.1.7/debian/changelog	2017-07-30 15:31:35.000000000 +0000
@@ -1,3 +1,20 @@
+netty (1:4.1.7-4) unstable; urgency=medium
+
+  * Team upload.
+  * Update debian/watch to repack with xz compression
+  * Bump Standards-Version to 4.0.0
+  * Update jctools2 patch for approach used upstream (see #866771)
+
+ -- tony mancill <tmancill@debian.org>  Sun, 30 Jul 2017 08:31:35 -0700
+
+netty (1:4.1.7-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to build against jctools 2.0 (Closes: #866771)
+  * Update libjctools-java build-dep to version 2.0
+
+ -- tony mancill <tmancill@debian.org>  Sat, 22 Jul 2017 18:56:07 -0700
+
 netty (1:4.1.7-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru netty-4.1.7/debian/control netty-4.1.7/debian/control
--- netty-4.1.7/debian/control	2017-01-16 07:54:16.000000000 +0000
+++ netty-4.1.7/debian/control	2017-07-30 15:31:35.000000000 +0000
@@ -18,7 +18,7 @@
                libcompress-lzf-java,
                libgoogle-gson-java,
                libjavassist-java,
-               libjctools-java,
+               libjctools-java (>= 2.0),
                libjzlib-java,
                liblog4j2-java,
                libmaven-antrun-plugin-java,
@@ -31,7 +31,7 @@
                libprotobuf-java,
                libxz-java,
                maven-debian-helper (>= 1.5)
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/netty.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/netty.git
 Homepage: http://netty.io/
diff -Nru netty-4.1.7/debian/patches/12-jctools2.patch netty-4.1.7/debian/patches/12-jctools2.patch
--- netty-4.1.7/debian/patches/12-jctools2.patch	1970-01-01 00:00:00.000000000 +0000
+++ netty-4.1.7/debian/patches/12-jctools2.patch	2017-07-30 15:31:35.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Update to build against jctools 2.x
+Author: tony mancill <tmancill@debian.org>
+Forwarded: not-needed
+
+--- a/common/src/main/java/io/netty/util/internal/PlatformDependent.java
++++ b/common/src/main/java/io/netty/util/internal/PlatformDependent.java
+@@ -835,7 +835,7 @@
+                 // up to the next power of two and so will overflow otherwise.
+                 final int capacity =
+                         Math.max(Math.min(maxCapacity, MAX_ALLOWED_MPSC_CAPACITY), MIN_MAX_MPSC_CAPACITY);
+-                return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity, true);
++                return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity);
+             } else {
+                 return new MpscLinkedAtomicQueue<T>();
+             }
diff -Nru netty-4.1.7/debian/patches/series netty-4.1.7/debian/patches/series
--- netty-4.1.7/debian/patches/series	2017-01-16 08:05:15.000000000 +0000
+++ netty-4.1.7/debian/patches/series	2017-07-30 15:31:35.000000000 +0000
@@ -9,3 +9,4 @@
 09-ignore-lz4.patch
 10-ignore-lzma.patch
 11-ignore-protobuf-nano.patch
+12-jctools2.patch
diff -Nru netty-4.1.7/debian/watch netty-4.1.7/debian/watch
--- netty-4.1.7/debian/watch	2017-01-16 01:06:30.000000000 +0000
+++ netty-4.1.7/debian/watch	2017-07-30 15:31:35.000000000 +0000
@@ -1,2 +1,3 @@
-version=3
-https://github.com/netty/netty/tags .*/netty-([\d\.]+).Final.tar.gz
+version=4
+opts="repack,compression=xz" \
+    https://github.com/netty/netty/tags .*/netty-([\d\.]+).Final.tar.gz