diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index a6ff9a3..fb86b88 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-%{short_name}
 Version:        3.2.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Provides new interfaces, implementations and utilities for Java Collections
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -128,16 +128,12 @@ cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testfram
 ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework 
 
 
-%files
+%files -f .mfiles
 %doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}.jar
 %{_javadir}/%{short_name}.jar
 
-%files testframework
-%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
-%{_mavendepmapfragdir}/%{name}-testframework
+%files testframework -f .mfiles-testframework
 %{_javadir}/%{name}-testframework.jar
 %{_javadir}/%{short_name}-testframework.jar
 
@@ -153,6 +149,9 @@ ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-tes
 
 
 %changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-21
+- Use .mfiles generated during build
+
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2.1-20
 - Use Requires: java-headless rebuild (#1067528)