diff --git a/all/pom.xml b/all/pom.xml
index f33895ce87..c9d60f7784 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -94,7 +94,7 @@
           <groupId>${project.groupId}</groupId>
           <artifactId>netty-transport-native-epoll</artifactId>
           <version>${project.version}</version>
-          <classifier>${os.detected.classifier}</classifier>
+          <classifier>${epoll.classifier}</classifier>
           <scope>compile</scope>
           <optional>true</optional>
         </dependency>
diff --git a/example/pom.xml b/example/pom.xml
index 4461bf99f2..662a1d171a 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netty-tcnative</artifactId>
-        <classifier>${os.detected.classifier}</classifier>
+        <classifier>${tcnative.classifier}</classifier>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.npn</groupId>
diff --git a/handler/pom.xml b/handler/pom.xml
index 58337548c7..67e3ceb449 100644
--- a/handler/pom.xml
+++ b/handler/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <classifier>${os.detected.classifier}</classifier>
+      <classifier>${tcnative.classifier}</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/microbench/pom.xml b/microbench/pom.xml
index e4f93df4bc..56c8926d81 100644
--- a/microbench/pom.xml
+++ b/microbench/pom.xml
@@ -68,7 +68,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
       <version>${project.version}</version>
-      <classifier>linux-${epoll.arch}</classifier>
+      <classifier>${epoll.classifier}</classifier>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index b4424e37d0..665c12cf94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
                         Release process must be performed on linux-x86_64.
                       </regexMessage>
                       <property>os.detected.classifier</property>
-                      <regex>^linux-x86_64$</regex>
+                      <regex>^linux-x86_64(\\-fedora)?$</regex>
                     </requireProperty>
                     <requireFilesContent>
                       <message>
@@ -602,6 +602,11 @@
     <argLine.bootcp>-Xbootclasspath/p:${jetty.alpn.path}</argLine.bootcp>
     <argLine.leak>-D_</argLine.leak> <!-- Overridden when 'leak' profile is active -->
     <argLine.coverage>-D_</argLine.coverage> <!-- Overridden when 'coverage' profile is active -->
+    <!-- Configure the os-maven-plugin extension to expand the classifier on                  -->
+    <!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
+    <os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
+    <tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
+    <epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
   </properties>
 
   <modules>
@@ -691,8 +696,8 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>netty-tcnative</artifactId>
-        <version>1.1.33.Fork6</version>
-        <classifier>${os.detected.classifier}</classifier>
+        <version>1.1.33.Fork7</version>
+        <classifier>${tcnative.classifier}</classifier>
         <scope>compile</scope>
         <optional>true</optional>
       </dependency>
@@ -937,7 +942,7 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.2.3.Final</version>
+        <version>1.4.0.Final</version>
       </extension>
     </extensions>
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index b984953a19..3086fe120c 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <classifier>${os.detected.classifier}</classifier>
+      <classifier>${tcnative.classifier}</classifier>
       <optional>true</optional>
     </dependency>
 
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index 12484d7cca..c5b0c84604 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <classifier>${os.detected.classifier}</classifier>
+      <classifier>${tcnative.classifier}</classifier>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -105,7 +105,7 @@
               <goal>jar</goal>
             </goals>
             <configuration>
-              <classifier>${os.detected.classifier}</classifier>
+              <classifier>${epoll.classifier}</classifier>
             </configuration>
           </execution>
         </executions>