diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec
index 5bcc150..83122d1 100644
--- a/felix-osgi-core.spec
+++ b/felix-osgi-core.spec
@@ -1,27 +1,23 @@
 %global bundle org.osgi.core
 
-Name:    felix-osgi-core
-Version: 1.4.0
-Release: 19%{?dist}
-Summary: Felix OSGi R4 Core Bundle
-Group:   Development/Libraries
-License: ASL 2.0
-URL:     http://felix.apache.org/site/apache-felix-osgi-core.html
-Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
-
-BuildArch: noarch
-
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: maven-local
-BuildRequires: felix-parent
-BuildRequires: mockito
+Name:           felix-osgi-core
+Version:        1.4.0
+Release:        20%{?dist}
+Summary:        Felix OSGi R4 Core Bundle
+License:        ASL 2.0
+URL:            http://felix.apache.org/site/apache-felix-osgi-core.html
+BuildArch:      noarch
+
+Source0:        http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 
 %description
 OSGi Service Platform Release 4 Core Interfaces and Classes.
 
 %package javadoc
-Group:          Documentation
 Summary:        API documentation for %{name}
 
 %description javadoc
@@ -41,12 +37,16 @@ export LC_ALL=en_US.UTF-8
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Thu Jun 16 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.0-20
+- Regenerate build-requires
+- Update to current packaging guidelines
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild