diff --git a/xalan-j2.spec b/xalan-j2.spec
index 2d4f4ac..7cdcb72 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -4,7 +4,7 @@
 
 Name:           xalan-j2
 Version:        %{version}
-Release:        3jpp_2fc
+Release:        3jpp_3fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -25,10 +25,9 @@ BuildRequires:  jpackage-utils >= 0:1.5, java-devel, xerces-j2
 # RHEL3 and FC2
 Obsoletes:	xalan-j <= 0:2.4.1
 # libgcj aot-compiled native libraries
-BuildRequires:         gcc-java >= 4.0.0-0.43
-BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch:         %{ix86} x86_64 ppc alpha
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description
 Xalan is an XSLT processor for transforming XML documents into HTML,
@@ -102,16 +101,6 @@ ant \
   samples \
   servlet
 
-gcj-dbtool -n build/%{name}-%{version}.db 2048
-aot-compile \
-    build/xalan-interpretive.jar \
-    build/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    build/%{name}-%{version}.db \
-    build/xalan-interpretive.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -124,15 +113,6 @@ install -p -m 644 build/xsltc.jar \
   $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 build/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -154,6 +134,7 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 ln -s %{_sysconfdir}/alternatives \
   $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
 
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -164,10 +145,10 @@ rm -f %{_javadir}/%{name}.jar
 %post
 update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
   jaxp_transform_impl %{_javadir}/%{name}.jar 30
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %preun
 {
@@ -195,14 +176,15 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %ghost %{_javadir}/jaxp_transform_impl.jar
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 
 %files xsltc
 %defattr(0644,root,root,0755)
 %{_javadir}/xsltc-%{version}.jar
 %{_javadir}/xsltc.jar
 #%ghost %{_javadir}/jaxp_transform_impl.jar
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xsltc-%{version}.jar.*
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -216,8 +198,13 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm (also BC-compiles xsltc and samples).
+
 * Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_2fc
 - Remove a tarball from the tarball too.
 - Fix demo subpackage's dependencies.