diff --git a/.cvsignore b/.cvsignore
index 5f054eb..922bc4e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-bsf-src-2.3.0-RHCLEAN.tar.bz2
-bsf-2.3.0
-noarch
-*.src.rpm
+bsf-src-2.3.0.tar.gz
diff --git a/bsf.spec b/bsf.spec
index 0956bd0..8032314 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -32,36 +32,35 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define section		free
-
-Name:		bsf
-Version:	2.3.0
-Release:	11jpp.1
-Epoch:		0
+Name:           bsf
+Version:        2.3.0
+Release:        11jpp.2%{?dist}
+Epoch:          0
 Summary:        Bean Scripting Framework
 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
-Patch1:			%{name}-javac.patch
-BuildRequires:	jpackage-utils >= 1.6
+#Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
+Source0:        %{name}-src-%{version}.tar.gz
+Patch1:                 %{name}-javac.patch
+BuildRequires:  jpackage-utils >= 1.6
 BuildRequires:  ant
-BuildRequires:	servlet
-BuildRequires:	tomcat5-jsp-2.0-api
+BuildRequires:  servlet
+BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  xalan-j2
-Requires:		servletapi5
-Requires:		xalan-j2
-Requires:		tomcat5-jsp-2.0-api
+Requires:               servletapi5
+Requires:               xalan-j2
+Requires:               tomcat5-jsp-2.0-api
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -91,8 +90,8 @@ engines:
 * JudoScript
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Development/Documentation
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -100,7 +99,6 @@ Requires(postun): /bin/rm
 Javadoc for %{name}.
 
 %prep
-%{__rm} -fr %{buildroot}
 %setup -q
 # remove all binary libs
 find . -name "*.jar" -exec %{__rm} -f {} \;
@@ -118,6 +116,7 @@ ant compile
 ant javadocs
 
 %install
+%{__rm} -fr %{buildroot}
 # jar
 %{__install} -d -m 755 %{buildroot}%{_javadir}
 %{__install} -m 644 src/build/lib/%{name}.jar \
@@ -177,6 +176,9 @@ fi
 %ghost %{_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.
+
 * Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:2.3.0-11jpp.1
 - Added missing requirements.
 
diff --git a/sources b/sources
index 0121125..0d69bb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a752da431f76047aae887e587f62946  bsf-src-2.3.0-RHCLEAN.tar.bz2
+78bae3747ca5734bb7554eed6868b7da  bsf-src-2.3.0.tar.gz