diff --git a/felix-shell.changes b/felix-shell.changes
index f725a45..79b853e 100644
--- a/felix-shell.changes
+++ b/felix-shell.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 31 06:10:51 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Build against OSGi R7 APIs
+
 -------------------------------------------------------------------
 Mon Dec  2 06:30:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/felix-shell.spec b/felix-shell.spec
index 69fefd9..e0da481 100644
--- a/felix-shell.spec
+++ b/felix-shell.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package felix-shell
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,14 +23,14 @@ Release:        0
 Summary:        Apache Felix Shell Service
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://felix.apache.org
+URL:            https://felix.apache.org
 Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-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
 
 %description
@@ -48,6 +48,10 @@ This package contains API documentation for %{name}.
 
 %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
 
+# 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_add_dep junit:junit::test
 
 %{mvn_file} :%{bundle} "felix/%{bundle}"
@@ -63,11 +67,10 @@ This package contains API documentation for %{name}.
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%license LICENSE
-%doc NOTICE DEPENDENCIES
+%license LICENSE NOTICE
+%doc DEPENDENCIES
 
 %files javadoc -f .mfiles-javadoc
-%license LICENSE
-%doc NOTICE
+%license LICENSE NOTICE
 
 %changelog