diff --git a/xerces-j2.spec b/xerces-j2.spec
index 2d13657..5f542b9 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -131,10 +131,16 @@ ant \
 	-Djar.resolver=xml-commons-resolver.jar \
 	clean jars javadocs
 
+gcj-dbtool -n build/%{name}-%{version}.db 2048
 aot-compile \
     build/xercesImpl.jar \
     build/lib%{name}.jar.so \
     "$RPM_OPT_FLAGS -fPIC"
+gcj-dbtool -f \
+    build/%{name}-%{version}.db \
+    build/xercesImpl.jar \
+    %{_libdir}/lib%{name}-%{version}.jar.so
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -152,10 +158,7 @@ cp -p build/lib%{name}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.ja
 # gcjdb
 gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
 mkdir -p $RPM_BUILD_ROOT$gcjdbdir
-gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
-gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
-  %{_libdir}/lib%{name}-%{version}.jar.so
+cp -p build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-impl-%{version}
@@ -284,6 +287,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 
 
 %changelog
+* Thu May 26 2005 Gary Benson <gbenson@redhat.com>
+- Rearrange how BC-compiled stuff is built and installed.
+
 * Mon May 23 2005 Gary Benson <gbenson@redhat.com> 0:2.6.2-4jpp_6fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.