diff --git a/bsf.spec b/bsf.spec
index 8032314..da2090d 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -41,7 +41,6 @@ License:        Apache License
 Url:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
 #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
-#Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
 Source0:        %{name}-src-%{version}.tar.gz
 Patch1:                 %{name}-javac.patch
 BuildRequires:  jpackage-utils >= 1.6
@@ -52,6 +51,7 @@ BuildRequires:  xalan-j2
 Requires:               servletapi5
 Requires:               xalan-j2
 Requires:               tomcat5-jsp-2.0-api
+Requires:               jpackage-utils
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
@@ -92,8 +92,6 @@ engines:
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -127,6 +125,7 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
 %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 %{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -135,15 +134,6 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
 %clean
 %{__rm} -rf %{buildroot}
 
-%post javadoc
-%{__rm} -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
-  %{__rm} -f %{_javadocdir}/%{name}
-fi
-
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -162,7 +152,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc license.txt src/AUTHORS src/BUILDING src/CHANGES src/CHANGES.old src/INSTALL src/README src/TODO
+%doc license.txt src/AUTHORS src/CHANGES src/CHANGES.old src/README src/TODO
 %{_javadir}/*
 
 %if %{gcj_support}
@@ -173,11 +163,11 @@ fi
 %defattr(-,root,root)
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}-%{version}/*
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
 
 %changelog
-* Wed Mar 07 2007 Permaine Cheung <dbhole@redhat.com> 0:2.3.0-11jpp.2
-- Update spec file as per Fedora guidelines.
+* Wed Mar 07 2007 Permaine Cheung <pcheung@redhat.com> 0:2.3.0-11jpp.2
+- Update spec file as per Fedora guidelines
 
 * Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:2.3.0-11jpp.1
 - Added missing requirements.