diff --git a/xalan-j2.spec b/xalan-j2.spec
index a8e8456..6e0122e 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
@@ -192,7 +192,7 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-serializ
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-xsltc.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 %add_maven_depmap JPP-%{name}-serializer.pom %{name}-serializer.jar
-%add_maven_depmap JPP-xsltc.pom xsltc.jar
+%add_maven_depmap -f xsltc JPP-xsltc.pom xsltc.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -225,19 +225,12 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
   update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-%files
+%files -f .mfiles
 %doc KEYS LICENSE.txt NOTICE.txt readme.html
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-serializer.jar
 %ghost %{_javadir}/jaxp_transform_impl.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}-serializer.pom
 
-%files xsltc
+%files xsltc -f .mfiles-xsltc
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/xsltc.jar
-%{_mavenpomdir}/JPP-xsltc.pom
 
 %files manual
 %doc LICENSE.txt NOTICE.txt
@@ -251,6 +244,10 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %{_datadir}/%{name}
 
 %changelog
+* Mon Aug 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.7.1-21
+- Move depmaps to appropriate packages
+- Resolves: rhbz#998594
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild