diff --git a/regexp.spec b/regexp.spec
index 4f003a0..8f7408f 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -1,7 +1,7 @@
 %define name		regexp
 %define full_name	jakarta-%{name}
 %define version		1.3
-%define release		2jpp_2fc
+%define release		2jpp_3fc
 %define section		free
 
 Name:           %{name}
@@ -20,10 +20,9 @@ Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
 # RHEL3 and FC2
 Obsoletes:	%{full_name} <= 0:1.2
 # 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
 Regexp is a 100% Pure Java Regular Expression package that was
@@ -50,16 +49,6 @@ find . -name "*.jar" -exec rm -f {} \;
 mkdir lib
 ant -Djakarta-site2.dir=. jar javadocs
 
-gcj-dbtool -n build/%{name}-%{version}.db 64
-aot-compile \
-    build/%{full_name}-%{version}.jar \
-    build/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    build/%{name}-%{version}.db \
-    build/%{full_name}-%{version}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -69,13 +58,8 @@ install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf docs/api
-# 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
+
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,10 +69,10 @@ rm -f %{_javadir}/%{full_name}.jar
 rm -f %{_javadir}/%{name}.jar
 
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
@@ -103,14 +87,17 @@ fi
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/*.jar
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 15 2005 Gary Benson <gbenson@redhat.com> 0:1.3-2jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jun 14 2005 Gary Benson <gbenson@redhat.com> 0:1.3-2jpp_2fc
 - Remove jarfile from the tarball.