diff --git a/bcel.spec b/bcel.spec
index d43d44f..6d4a710 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -45,7 +45,7 @@
 
 Name:           bcel
 Version:        5.1
-Release:        7jpp_334fc
+Release:        8jpp.1
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        Apache Software License
@@ -108,8 +108,8 @@ being the Xalan XSLT processor at Apache.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 %{summary}.
@@ -212,6 +212,8 @@ ant 	-Dbuild.dest=build/classes -Dbuild.dir=build \
 %__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 %__rm -rf docs/api
 %endif
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
+
 # samples
 %__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}
 %__cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version}
@@ -267,6 +269,7 @@ fi
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -279,6 +282,10 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp.1
+- Merge with upstream version:
+ - Add missing javadoc requires
+
 * Thu Aug 10 2006 Karsten Hopp <karsten@redhat.de> 5.1-7jpp_334fc
 - last release was 333 (typo), need to build 334 now
 - Requires(post/postun): coreutils