diff --git a/jdom2.spec b/jdom2.spec
index d9056c2..c9fa8ad 100644
--- a/jdom2.spec
+++ b/jdom2.spec
@@ -27,7 +27,7 @@ BuildRequires: cobertura
 BuildRequires: isorelax
 BuildRequires: jakarta-oro
 BuildRequires: jaxen
-BuildRequires: log4j
+BuildRequires: log4j12
 BuildRequires: objectweb-asm3
 BuildRequires: xalan-j2
 BuildRequires: xerces-j2
@@ -65,6 +65,7 @@ find . -name "*.jar" -print -delete
 
 %patch0 -p0
 sed -i "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
+sed -i "s|log4j.jar|log4j12-12.jar|" build.xml
 %patch1 -p1
 
 cp -p %{SOURCE1} maven/contrib.pom
@@ -95,10 +96,8 @@ install -pm 644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mav
 mkdir -p %{buildroot}%{_javadocdir}
 cp -rp build/apidocs %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%{_javadir}/%{name}
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 
 %files javadoc