diff --git a/.gitignore b/.gitignore
index de0dfc4..7069f86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+/results_*
+/*.src.rpm
+
 /grizzly-2.3.1.tar.xz
 /grizzly-2.3.2.tar.xz
 /grizzly-2.3.3.tar.xz
diff --git a/grizzly.spec b/grizzly.spec
index 8b02395..3d32221 100644
--- a/grizzly.spec
+++ b/grizzly.spec
@@ -10,7 +10,7 @@
 
 Name:          grizzly
 Version:       2.3.24
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Java NIO Server Framework
 # see Grizzly_THIRDPARTYLICENSEREADME.txt
 License:       (CDDL or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain
@@ -43,8 +43,8 @@ BuildRequires: mvn(org.glassfish.grizzly:grizzly-npn-bootstrap)
 BuildRequires: mvn(org.glassfish.hk2:hk2-inhabitant-generator)
 BuildRequires: mvn(org.glassfish.hk2:osgiversion-maven-plugin)
 BuildRequires: mvn(org.mockito:mockito-all)
-BuildRequires: mvn(org.osgi:org.osgi.compendium)
-BuildRequires: mvn(org.osgi:org.osgi.core)
+BuildRequires: mvn(org.osgi:osgi.cmpn)
+BuildRequires: mvn(org.osgi:osgi.core)
 
 BuildArch:     noarch
 
@@ -82,6 +82,10 @@ find . -name '*.js' -print -delete
 %pom_disable_module bundles extras
 %pom_disable_module bundles modules
 
+# use latest OSGi implementation
+%pom_change_dep -r :org.osgi.core org.osgi:osgi.core
+%pom_change_dep -r :org.osgi.compendium org.osgi:osgi.cmpn
+
 # org.ops4j maven-pax-plugin  1.5
 %pom_disable_module grizzly-httpservice extras
 # Unsupport war extension
@@ -187,6 +191,9 @@ done
 %license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
 
 %changelog
+* Tue Oct 08 2019 Fabio Valentini <decathorpe@gmail.com> - 2.3.24-9
+- Migrate away from the retired felix OSGi implementation.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.24-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild