diff --git a/SECURITY.md b/SECURITY.md
index d4e8536aa3..4dc36015cf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -95,7 +95,7 @@ buildscript {
 }
 
 // Use the osdetector-gradle-plugin
-apply plugin: "osdetector"
+apply plugin: "com.google.osdetector"
 
 // Configure a special classifier on Fedora-"like" systems.
 osdetector.classifierWithLikes = ['fedora']
diff --git a/build.gradle b/build.gradle
index 28dfb98afc..e7b1c2740b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     mavenLocal()
   }
   dependencies {
-    classpath 'com.google.gradle:osdetector-gradle-plugin:1.3.0'
+    classpath 'com.google.gradle:osdetector-gradle-plugin:1.4.0'
   }
 }
 
@@ -13,10 +13,13 @@ subprojects {
     apply plugin: "java"
     apply plugin: "maven"
     apply plugin: "idea"
-    apply plugin: "osdetector"
     apply plugin: "signing"
     apply plugin: "jacoco"
 
+    apply plugin: "com.google.osdetector"
+    // Configure a special classifier on Fedora-"like" systems.
+    osdetector.classifierWithLikes = ['fedora']
+
     group = "io.grpc"
     version = "0.10.0-SNAPSHOT"
 
@@ -28,7 +31,6 @@ subprojects {
         mavenLocal()
     }
 
-
     [compileJava, compileTestJava].each() {
         it.options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation", "-Xlint:-options",
             "-Xlint:rawtypes"]
@@ -110,20 +112,6 @@ subprojects {
           }
         }
 
-        def tcnative_suffix = "";
-        if (osdetector.classifier in ["linux-x86_64", "osx-x86_64", "windows-x86_64"]) {
-            // The native code is only pre-compiled on certain platforms.
-            tcnative_suffix = ":" + osdetector.classifier
-            // Fedora variants use a different soname for OpenSSL than other linux distributions
-            // (see http://netty.io/wiki/forked-tomcat-native.html). Netty-tcnative, however
-            // assumes Fedora as the default "linux", while calling out "_debian" as a special
-            // build for debian-based systems. This should be inverted in future releases of
-            // netty-tcnative, but in the meantime we invert the logic manually here so that
-            // "debian" is used as the default linux distribution.
-            if (osdetector.os == "linux" && !osdetector.release.isLike("fedora")) {
-                tcnative_suffix += "_debian";
-            }
-        }
         def epoll_suffix = "";
         if (osdetector.classifier in ["linux-x86_64"]) {
             // The native code is only pre-compiled on certain platforms.
@@ -143,7 +131,7 @@ subprojects {
                 protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.0',
 
                 netty: 'io.netty:netty-codec-http2:4.1.0.Beta6',
-                netty_tcnative: 'io.netty:netty-tcnative:1.1.33.Fork6' + tcnative_suffix,
+                netty_tcnative: 'io.netty:netty-tcnative:1.1.33.Fork7:' + osdetector.classifier,
                 netty_transport_native_epoll: 'io.netty:netty-transport-native-epoll:4.1.0.Beta6' + epoll_suffix,
 
                 // Test dependencies.