diff --git a/google-guice.spec b/google-guice.spec
index dbbb185..3e97985 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -3,7 +3,7 @@
 
 Name:           google-%{short_name}
 Version:        3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
 Group:          Development/Libraries
 License:        ASL 2.0
@@ -13,6 +13,7 @@ BuildArch:      noarch
 
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-tools >= 0.7.0
 BuildRequires:  maven
 BuildRequires:  maven-remote-resources-plugin
 BuildRequires:  apache-resource-bundles
@@ -259,66 +260,32 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}
 
 
-%files
+%files -f maven-files-%{name}
 %doc README
 %{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}/%{name}.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files -n %{short_name}-assistedinject
-%{_javadir}/%{short_name}/%{short_name}-assistedinject.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-assistedinject.pom
-%{_mavendepmapfragdir}/%{name}-assistedinject
-
-%files -n %{short_name}-extensions
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-extensions.pom
-%{_mavendepmapfragdir}/%{name}-extensions
-
-%files -n %{short_name}-grapher
-%{_javadir}/%{short_name}/%{short_name}-grapher.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-grapher.pom
-%{_mavendepmapfragdir}/%{name}-grapher
-
-%files -n %{short_name}-jmx
-%{_javadir}/%{short_name}/%{short_name}-jmx.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-jmx.pom
-%{_mavendepmapfragdir}/%{name}-jmx
-
-%files -n %{short_name}-jndi
-%{_javadir}/%{short_name}/%{short_name}-jndi.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-jndi.pom
-%{_mavendepmapfragdir}/%{name}-jndi
-
-%files -n %{short_name}-multibindings
-%{_javadir}/%{short_name}/%{short_name}-multibindings.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-multibindings.pom
-%{_mavendepmapfragdir}/%{name}-multibindings
-
-%files -n %{short_name}-parent
+
+%files -n %{short_name}-assistedinject -f maven-files-%{name}-assistedinject
+
+%files -n %{short_name}-extensions -f maven-files-%{name}-extensions
+
+%files -n %{short_name}-grapher -f maven-files-%{name}-grapher
+
+%files -n %{short_name}-jmx -f maven-files-%{name}-jmx
+
+%files -n %{short_name}-jndi -f maven-files-%{name}-jndi
+
+%files -n %{short_name}-multibindings -f maven-files-%{name}-multibindings
+
+%files -n %{short_name}-parent -f maven-files-%{name}-parent
 %doc COPYING
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-parent.pom
-%{_mavendepmapfragdir}/%{name}-parent
 
-%files -n %{short_name}-persist
-%{_javadir}/%{short_name}/%{short_name}-persist.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-persist.pom
-%{_mavendepmapfragdir}/%{name}-persist
+%files -n %{short_name}-persist -f maven-files-%{name}-persist
 
-%files -n %{short_name}-servlet
-%{_javadir}/%{short_name}/%{short_name}-servlet.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-servlet.pom
-%{_mavendepmapfragdir}/%{name}-servlet
+%files -n %{short_name}-servlet -f maven-files-%{name}-servlet
 
-%files -n %{short_name}-spring
-%{_javadir}/%{short_name}/%{short_name}-spring.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-spring.pom
-%{_mavendepmapfragdir}/%{name}-spring
+%files -n %{short_name}-spring -f maven-files-%{name}-spring
 
-%files -n %{short_name}-throwingproviders
-%{_javadir}/%{short_name}/%{short_name}-throwingproviders.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-throwingproviders.pom
-%{_mavendepmapfragdir}/%{name}-throwingproviders
+%files -n %{short_name}-throwingproviders -f maven-files-%{name}-throwingproviders
 
 %files javadoc
 %doc COPYING
@@ -326,6 +293,9 @@ ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}
 
 
 %changelog
+* Wed Oct 31 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.1.2-2
+- Use new generated maven filelist feature from javapackages-tools
+
 * Fri Oct  5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-1
 - Complete rewrite of the spec file
 - New upstream, to ease future maintenance
@@ -369,5 +339,3 @@ ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}
 
 * Thu Oct  7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-1.1219svn
 - Initial version of the package
-
-