diff --git a/java_cup.spec b/java_cup.spec
index 7a6d0a7..5d73d48 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -34,9 +34,10 @@
 
 Name:           java_cup
 Version:        0.11a
-Release:        10%{?dist}
+Release:        11%{?dist}
 Epoch:          1
 Summary:        Java source interpreter
+Group:          Development/Tools
 License:        MIT
 URL:            http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/
 #svn export -r 21 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11a 
@@ -48,26 +49,28 @@ Source2:	%{name}-runtime-MANIFEST.MF
 Source3:	LICENSE.txt
 Patch0:         %{name}-build.patch
 Patch1:         java_cup-0.11a-manifest.patch
-BuildRequires:  zip
-BuildRequires:  ant
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:	jflex
+
+BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: jflex
 %if ! %{with_bootstrap}
-BuildRequires:	java_cup >= 1:0.11a
+BuildRequires: java_cup >= 1:0.11a
 %endif
-Group:          Development/Tools
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: zip
+
+Requires:      java
+Requires:      jpackage-utils
+BuildArch:     noarch
 
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 java_cup is a LALR Parser Generator for Java
 
 %package javadoc
-Summary:        Javadoc for java_cup
-Group:          Documentation
+Summary:       Javadoc for java_cup
+Group:         Documentation
+Requires:      jpackage-utils
 
 %description javadoc
 Javadoc for java_cup
@@ -114,50 +117,42 @@ touch META-INF/MANIFEST.MF
 zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF
 
 # jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/java-cup-%{pkg_version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 dist/java-cup-%{pkg_version}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
-
-%add_to_maven_depmap java_cup java_cup %{version} JPP java_cup
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 dist/java-cup-%{pkg_version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 dist/java-cup-%{pkg_version}-runtime.jar %{buildroot}%{_javadir}/%{name}-runtime.jar
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap java_cup java_cup %{version} JPP java_cup
 
-%postun
-%update_maven_depmap
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(0644,root,root,0755)
 %doc changelog.txt LICENSE.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files manual
-%defattr(0644,root,root,0755)
-%doc manual.html
+%doc manual.html LICENSE.txt
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
+%doc LICENSE.txt
+%{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 13 2012 gil cattaneo <puntogil@libero.it> 1:0.11a-11
+- adapt to current guideline
+- add %%pre javadoc script
+
 * Tue Nov 13 2012 Tom Callaway <spot@fedoraproject.org> - 1:0.11a-10
 - include copy of LICENSE, correct License tag