diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec
index 2786c28..a6c739a 100644
--- a/maven-invoker-plugin.spec
+++ b/maven-invoker-plugin.spec
@@ -1,42 +1,36 @@
 Name:           maven-invoker-plugin
 Version:        1.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Maven Invoker Plugin
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-invoker-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Patch0:         pom-xml.patch
-
 BuildArch: noarch
 
-# Basic stuff
-BuildRequires: jpackage-utils
-BuildRequires: java-devel >= 1:1.6.0
-# Maven and its dependencies
-BuildRequires: maven-local
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-script-interpreter
-BuildRequires: maven-invoker
-BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
-BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
-
-# Others
-BuildRequires: groovy
-
-Requires: java
-Requires: maven
-Requires: groovy
-Requires: jpackage-utils
-Requires: maven-invoker
-Requires: maven-shared-reporting-api
-Requires: maven-shared-reporting-impl
-Requires: maven-script-interpreter
-Requires: mvn(org.apache.maven.doxia:doxia-sink-api)
-Requires: mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  maven-local
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires:  mvn(org.apache.maven.shared:maven-invoker)
+BuildRequires:  mvn(org.apache.maven.shared:maven-script-interpreter)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven:maven-settings)
+BuildRequires:  mvn(org.beanshell:bsh)
+BuildRequires:  mvn(org.codehaus.groovy:groovy)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-i18n)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
 Provides:       maven2-plugin-invoker = 1:%{version}-%{release}
 Obsoletes:      maven2-plugin-invoker <= 0:2.0.8
@@ -48,9 +42,7 @@ can verify the output generated from a given project execution.
   
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -72,6 +64,9 @@ API documentation for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-8
+- Update to current packaging guidelines
+
 * Mon Aug 12 2013 Alexander Kurtakov <akurtako@redhat.com> 1.8-7
 - Build with xmvn.