diff --git a/.gitignore b/.gitignore
index 7529bc1..ffdd417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+/results_*
+/*.src.rpm
+
 /netty-3.6.6.Final-dist.tar.bz2
 /netty-3.10.0.Final-dist.tar.bz2
 /netty-3.9.3.Final-dist.tar.bz2
diff --git a/netty3.spec b/netty3.spec
index cb05c91..6426c56 100644
--- a/netty3.spec
+++ b/netty3.spec
@@ -3,7 +3,7 @@
 
 Name:           netty3
 Version:        3.10.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An asynchronous event-driven network application framework and tools for Java
 # CC0: src/main/java/org/jboss/netty/handler/codec/base64/Base64.java
 License:        ASL 2.0 and BSD and CC0
@@ -26,14 +26,13 @@ BuildRequires:  mvn(log4j:log4j:12)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.ant:ant-launcher)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.felix:org.osgi.compendium)
-BuildRequires:  mvn(org.apache.felix:org.osgi.core)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-resources-plugin)
 BuildRequires:  mvn(org.bouncycastle:bcpkix-jdk15on)
 BuildRequires:  mvn(org.jboss.logging:jboss-logging)
 BuildRequires:  mvn(org.jboss.marshalling:jboss-marshalling)
+BuildRequires:  mvn(org.osgi:osgi.cmpn)
+BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
@@ -84,6 +83,10 @@ rm -rf jar doc license
 # Force use servlet 3.1 apis
 %pom_change_dep :servlet-api javax.servlet:javax.servlet-api:3.1.0
 
+# use latest OSGi implementation
+%pom_change_dep :org.osgi.core org.osgi:osgi.core
+%pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn
+
 %pom_xpath_set "pom:dependency[pom:artifactId = 'log4j']/pom:version" 12
 
 # Uneeded tasks
@@ -127,6 +130,9 @@ rm -v src/main/java/org/jboss/netty/handler/ssl/JettyNpnSslEngine.java
 %license LICENSE.txt NOTICE.txt
  
 %changelog
+* Sat Oct 05 2019 Fabio Valentini <decathorpe@gmail.com> - 3.10.6-8
+- Migrate away from the retired felix OSGi implementation.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild