diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index 3ce54a2..c3cfbe1 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -3,20 +3,17 @@
 
 Name:           apache-%{short_name}
 Version:        2.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          1
 Summary:        Utilities to assist with developing IO functionality
 License:        ASL 2.0
-Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6
 BuildRequires:  maven-local
-BuildRequires:  javapackages-tools >= 0.10.0
 BuildRequires:  apache-commons-parent
-BuildRequires:  maven-surefire-provider-junit
 
 Provides:       jakarta-%{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{epoch}:%{version}-%{release}
@@ -28,7 +25,6 @@ to assist with developing IO functionality.
 
 %package javadoc
 Summary:        API documentation for %{name}
-Group:          Documentation
 Provides:       jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name}-javadoc < %{epoch}:%{version}-%{release}
 
@@ -54,6 +50,9 @@ sed -i 's/\r//' *.txt
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Apr 15 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.4-8
+- Update to current packaging guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild