diff --git a/xalan-j2.spec b/xalan-j2.spec
index 252885a..5915aad 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        23%{?dist}
+Release:        24%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
@@ -52,14 +52,13 @@ Patch1:         %{name}-serializerJARname.patch
 # and 1581426.
 Patch2:         %{name}-CVE-2014-0107.patch
 URL:            http://xalan.apache.org/
-Group:          Development/Libraries
 
 BuildArch:      noarch
 Provides:       jaxp_transform_impl
 Requires:       xerces-j2
 Requires(post): chkconfig
 Requires(preun): chkconfig
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  javapackages-local
 BuildRequires:  java-devel
 BuildRequires:  ant
 BuildRequires:  bcel
@@ -81,7 +80,6 @@ in other program.
 
 %package        xsltc
 Summary:        XSLT compiler
-Group:          Development/Tools
 Requires:       java_cup
 Requires:       bcel
 Requires:       regexp
@@ -93,15 +91,12 @@ lightweight and portable Java byte codes called translets.
 
 %package        manual
 Summary:        Manual for %{name}
-Group:          Documentation
 
 %description    manual
 Documentation for %{name}.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 BuildRequires:  java-javadoc
 
 %description    javadoc
@@ -109,7 +104,6 @@ Javadoc for %{name}.
 
 %package        demo
 Summary:        Demo for %{name}
-Group:          Documentation
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       tomcat-servlet-3.0-api
 
@@ -231,24 +225,28 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 } >/dev/null 2>&1 || :
 
 %files -f .mfiles
-%doc KEYS LICENSE.txt NOTICE.txt readme.html
+%license LICENSE.txt NOTICE.txt
+%doc KEYS readme.html
 %ghost %{_javadir}/jaxp_transform_impl.jar
 
 %files xsltc -f .mfiles-xsltc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %files manual
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 %doc build/docs/*
 
 %files javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 %doc %{_javadocdir}/%{name}
 
 %files demo
 %{_datadir}/%{name}
 
 %changelog
+* Wed Feb 11 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.7.1-24
+- Update to current packaging guidelines
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.1-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild