diff --git a/bsf.spec b/bsf.spec
index d9bffd1..d3889fb 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -1,6 +1,6 @@
 %define name		bsf
 %define version		2.3.0
-%define release 6jpp_3fc
+%define release 6jpp_4fc
 %define section		free
 
 Name:		%{name}
@@ -13,9 +13,14 @@ Url:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
 Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
 Patch1:		bsf-javac.patch
+BuildRequires:	jpackage-utils >= 1.6
 BuildRequires:  ant
 BuildRequires:	servletapi5
 BuildRequires:  xalan-j2
+BuildRequires:	tomcat5-jsp-2.0-api
+Requires:	servletapi5
+Requires:	xalan-j2
+Requires: 	tomcat5-jsp-2.0-api
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -64,10 +69,7 @@ find . -name "*.tar.gz" -exec rm -f {} \;
 rmdir $RPM_BUILD_DIR/bsf
 
 %build
-export CLASSPATH=\
-%{_javadir}/xalan-j2.jar:\
-%{_javadir}/servletapi5.jar:\
-%{_javadir}/jspapi.jar
+export CLASSPATH=`build-classpath xalan-j2 servletapi5 jspapi`
 cd src
 ant realclean
 ant compile
@@ -113,6 +115,9 @@ fi
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jun  5 2006 Deepak Bhole <dbhole@redhat.com> - 0:2.3.0-6jpp_4fc
+- Add missing Requires/BuildRequires for tomcat5-jsp-2.0-api and others.
+
 * Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:2.3.0-6jpp_3fc
 - stop scriptlet spew