diff --git a/ant.spec b/ant.spec
index 1051790..812c790 100644
--- a/ant.spec
+++ b/ant.spec
@@ -36,7 +36,7 @@
 
 Name:           ant
 Version:        1.9.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -389,7 +389,7 @@ do
 
   #install pom
   install -p -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname}
-  %add_maven_depmap ${pomname} %{name}/${jarname}.jar -a "${alias}"
+  %add_maven_depmap ${pomname} %{name}/${jarname}.jar -a "${alias}" -f ${jarname/ant-/}
 done
 
 for mod in ant ant-bootstrap ant-launcher; do
@@ -453,7 +453,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{ant} test
 %endif
 
-%files
+%files -f .mfiles
+%files -f .mfiles-ant
+%files -f .mfiles-launcher
 %doc KEYS LICENSE NOTICE README WHATSNEW
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(0755,root,root) %{_bindir}/ant
@@ -464,8 +466,6 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadir}/%{name}-launcher.jar
 %{_javadir}/%{name}-bootstrap.jar
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}.jar
-%{_javadir}/%{name}/%{name}-launcher.jar
 %{_javadir}/%{name}/%{name}-bootstrap.jar
 %dir %{ant_home}
 %dir %{ant_home}/bin
@@ -486,99 +486,80 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{ant_home}/lib/%{name}-launcher.jar
 %{ant_home}/lib/%{name}-bootstrap.jar
 %dir %{_sysconfdir}/%{name}.d
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files jmf
-%{_javadir}/%{name}/%{name}-jmf.jar
+%files jmf -f .mfiles-jmf
 %{ant_home}/lib/%{name}-jmf.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jmf
 
-%files swing
-%{_javadir}/%{name}/%{name}-swing.jar
+%files swing -f .mfiles-swing
 %{ant_home}/lib/%{name}-swing.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/swing
 
-%files antlr
-%{_javadir}/%{name}/%{name}-antlr.jar
+%files antlr -f .mfiles-antlr
 %{ant_home}/lib/%{name}-antlr.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/antlr
 
-%files apache-bsf
-%{_javadir}/%{name}/%{name}-apache-bsf.jar
+%files apache-bsf -f .mfiles-apache-bsf
 %{ant_home}/lib/%{name}-apache-bsf.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
 
-%files apache-resolver
-%{_javadir}/%{name}/%{name}-apache-resolver.jar
+%files apache-resolver -f .mfiles-apache-resolver
 %{ant_home}/lib/%{name}-apache-resolver.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
 
-%files commons-logging
+%files commons-logging -f .mfiles-commons-logging
 %defattr(-,root,root,-)
-%{_javadir}/%{name}/%{name}-commons-logging.jar
 %{ant_home}/lib/%{name}-commons-logging.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
 
-%files commons-net
-%{_javadir}/%{name}/%{name}-commons-net.jar
+%files commons-net -f .mfiles-commons-net
 %{ant_home}/lib/%{name}-commons-net.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
 
 # Disable as we dont ship the dependencies
 %if 0
-%files jai
-%{_javadir}/%{name}/%{name}-jai.jar
+%files jai -f .mfiles-jai
 %{ant_home}/lib/%{name}-jai.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jai
 %endif
 
-%files apache-bcel
-%{_javadir}/%{name}/%{name}-apache-bcel.jar
+%files apache-bcel -f .mfiles-apache-bcel
 %{ant_home}/lib/%{name}-apache-bcel.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
 
-%files apache-log4j
-%{_javadir}/%{name}/%{name}-apache-log4j.jar
+%files apache-log4j -f .mfiles-apache-log4j
 %{ant_home}/lib/%{name}-apache-log4j.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
 
-%files apache-oro
-%{_javadir}/%{name}/%{name}-apache-oro.jar
+%files apache-oro -f .mfiles-apache-oro
 %{ant_home}/lib/%{name}-apache-oro.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
 %{ant_home}/etc/maudit-frames.xsl
 
-%files apache-regexp
-%{_javadir}/%{name}/%{name}-apache-regexp.jar
+%files apache-regexp -f .mfiles-apache-regexp
 %{ant_home}/lib/%{name}-apache-regexp.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
 
-%files apache-xalan2
-%{_javadir}/%{name}/%{name}-apache-xalan2.jar
+%files apache-xalan2 -f .mfiles-apache-xalan2
 %{ant_home}/lib/%{name}-apache-xalan2.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
 
-%files javamail
-%{_javadir}/%{name}/%{name}-javamail.jar
+%files javamail -f .mfiles-javamail
 %{ant_home}/lib/%{name}-javamail.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/javamail
 
-%files jdepend
-%{_javadir}/%{name}/%{name}-jdepend.jar
+%files jdepend -f .mfiles-jdepend
 %{ant_home}/lib/%{name}-jdepend.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
 %{ant_home}/etc/jdepend.xsl
 %{ant_home}/etc/jdepend-frames.xsl
 
-%files jsch
-%{_javadir}/%{name}/%{name}-jsch.jar
+%files jsch -f .mfiles-jsch
 %{ant_home}/lib/%{name}-jsch.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jsch
 
-%files junit
-%{_javadir}/%{name}/%{name}-junit.jar
-%{_javadir}/%{name}/%{name}-junit4.jar
+%files junit -f .mfiles-junit
+%files junit -f .mfiles-junit4
 %{ant_home}/lib/%{name}-junit.jar
 %{ant_home}/lib/%{name}-junit4.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/junit
@@ -586,8 +567,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
 
-%files testutil
-%{_javadir}/%{name}/%{name}-testutil.jar
+%files testutil -f .mfiles-testutil
 %{ant_home}/lib/%{name}-testutil.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/testutil
 
@@ -604,6 +584,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.2-7
+- Install Maven depmaps in appropriate subpackages
+- Resolves: rhbz#996062
+
 * Fri Aug 30 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.2-6
 - Fix antRun script
 - Resolves: rhbz#675949