diff --git a/regexp.spec b/regexp.spec
index a8b44f3..5edbc7d 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -42,7 +42,7 @@ Javadoc for %{name}.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -n %{full_name}-%{version}
+%setup -q -n %{full_name}-%{version}
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -50,11 +50,15 @@ find . -name "*.jar" -exec rm -f {} \;
 mkdir lib
 ant -Djakarta-site2.dir=. jar javadocs
 
+gcj-dbtool -n build/%{name}-%{version}.db 128
 aot-compile \
     build/%{full_name}-%{version}.jar \
-    lib%{name}-%{version}.jar.so \
+    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
@@ -67,15 +71,12 @@ 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 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
+install -m 755 build/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
 ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
 # 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
+install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
+install -m 644 build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +112,9 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %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:1.3-1jpp_6fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.