diff --git a/bsf.spec b/bsf.spec
index a65339b..ded512a 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -30,7 +30,7 @@
 
 Name:           bsf
 Version:        2.4.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 2.0
@@ -88,46 +88,41 @@ Javadoc for %{name}.
 %setup -q
 # remove all binary libs
 find . -name "*.jar" -exec %{__rm} -f {} \;
-%{__rm} -fr bsf
+rm -fr bsf
 
 %patch0 -p1
 %patch1 -p1
 
 %build
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
 export CLASSPATH=$(build-classpath apache-commons-logging xalan-j2 rhino)
 ant jar
-%{__rm} -rf bsf/src/org/apache/bsf/engines/java
+rm -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
 
 %install
 # jar
-%{__install} -d -m 755 %{buildroot}%{_javadir}
-%{__install} -m 644 build/lib/%{name}.jar \
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 build/lib/%{name}.jar \
              %{buildroot}%{_javadir}/%{name}.jar
 # javadoc
-%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.bsf:%{name}"
+install -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap -a "org.apache.bsf:%{name}"
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-20
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.4.0-18
+- Use .mfiles generated during build
+- Update to current packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild