diff --git a/.cvsignore b/.cvsignore
index e6b17ef..96ed465 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,4 @@
-hsqldb_1_7_2_3.zip
+hsqldb_1_7_3_0.zip
+hsqldb
+noarch
+*.src.rpm
diff --git a/hsqldb.spec b/hsqldb.spec
index ab7f629..cbd8584 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -1,9 +1,9 @@
 %define section		devel
 
 %define name		hsqldb
-%define version		1.72.3
-%define cvs_version	1_7_2_3
-%define release		2jpp
+%define version		1.73.0
+%define cvs_version	1_7_3_0
+%define release		2jpp_0fc
 
 Name:		%{name}
 Version:	%{version}
@@ -19,16 +19,15 @@ Source3:	%{name}-%{version}-standard-webserver.properties
 Source4:	%{name}-%{version}-standard-sqltool.rc
 Patch0:		%{name}-%{version}-scripts.patch
 Patch1:		%{name}-%{version}-build_xml.patch
-Requires:	servletapi4
+Patch2:		%{name}-no-sun.security.patch
+Requires:	servletapi5
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	servletapi4
+BuildRequires:	servletapi5
 Group:		Development/Java
 Buildarch:	noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-Distribution:	JPackage
-Vendor:		JPackage Project
 
 %description
 HSQLdb is a relational database engine written in JavaTM , with a JDBC
@@ -87,6 +86,7 @@ chmod -R go=u-w *
 
 %patch0
 %patch1
+%patch2 -p1
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -94,7 +94,7 @@ jsse/jsse \
 jsse/jnet \
 jsse/jcert \
 jdbc-stdext \
-servletapi4 \
+servletapi5 \
 junit)
 pushd build
 ant jar javadoc
@@ -133,7 +133,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r doc/src/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf doc/src
 # manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -r doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp index.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -152,7 +152,7 @@ rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
 rm -f %{_localstatedir}/lib/%{name}/lib/servlet.jar
 (cd %{_localstatedir}/lib/%{name}/lib
     ln -s $(build-classpath hsqldb) hsqldb.jar
-    ln -s $(build-classpath servletapi4) servlet.jar
+    ln -s $(build-classpath servletapi5) servlet.jar
 )
 
 %preun
@@ -187,7 +187,7 @@ fi
 
 %files manual
 %defattr(0644,root,root,0755)
-%doc doc/*
+%doc %{_docdir}/%{name}-%{version}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -198,6 +198,18 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jun  2 2005 Gary Benson <gbenson@redhat.com>
+- Avoid Sun-specific classes.
+- Build with servletapi5.
+
+* Thu Dec 23 2004 Fernando Nasser <fnasser@redhat.com> 0:1.73.0-1jpp_1rh
+- Merge with upstream for upgrade
+
+* Thu Dec 23 2004 Fernando Nasser <fnasser@redhat.com> 0:1.73.0-1jpp
+- Upgrade to 1.7.3.0
+
+* Thu Dec 23 2004 Fernando Nasser <fnasser@redhat.com> 0:1.72.3-2jpp_1rh
+- First Red Hat release
 
 * Wed Aug 25 2004 Ralph Apel <r.apel at r-apel.de> 0:1.72.3-2jpp
 - Build with ant-1.6.2
diff --git a/sources b/sources
index 9e2972e..e4a673a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b28cbab41c597fbf63d59ef8b52fffec  hsqldb_1_7_2_3.zip
+8d8896349da790cc39e74cd288fa6335  hsqldb_1_7_3_0.zip